- updated gettext BR

[packages/compiz.git] / compiz.spec

diff --git a/compiz.spec b/compiz.spec
index e8fdda03195a61c3a2e33b5f235fce85823895c1..d9cb8c7386663d038cfb5777ac7e77d8051e30cc 100644 (file)
--- a/compiz.spec
+++ b/compiz.spec
@@ -2,24 +2,25 @@
 # Conditional build:
 %bcond_without gconf           # gconf plugin
 %bcond_without gtk             # gtk window decorator
-%bcond_without gnome           # gnome settings module
+%bcond_with    gnome           # gnome settings module
 %bcond_without metacity        # metacity theme support
 %bcond_with    kde             # kde-window-decorator and kconfig
 %bcond_without kde4            # kde4-window-decorator
-#
+
 Summary:       OpenGL window and compositing manager
 Summary(pl.UTF-8):     OpenGL-owy zarządca okien i składania
 Name:          compiz
 # note that even versions are STABLE
-Version:       0.8.4
-Release:       4
+Version:       0.8.6
+Release:       3
 License:       GPL or MIT
 Group:         X11/Applications
 Source0:       http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 03fa78ce0c464f3a413b2a3b74f09559
+# Source0-md5: 1e284eade99ff310551d5919b6ba57c1
+Source1:       %{name}-gtk
+Source2:       %{name}-gtk.desktop
 Patch0:                %{name}-kde4.patch
-Patch1:                %{name}-libpng14.patch
-Patch2:                %{name}-kde44-api.patch
+Patch1:                %{name}-no-gdk_display.patch
 URL:           http://www.compiz.org/
 %if %{with gconf} || %{with gtk}
 BuildRequires: GConf2-devel >= 2.0
@@ -30,7 +31,7 @@ BuildRequires:        autoconf >= 2.57
 BuildRequires: automake >= 1:1.7
 BuildRequires: cairo-devel >= 1.0
 BuildRequires: dbus-glib-devel
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 2.0
 # <sys/inotify.h>
 BuildRequires: glibc-devel >= 6:2.4
@@ -240,7 +241,6 @@ Dekorator okien dla KDE 4.
 %setup -q
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__intltoolize}
@@ -249,8 +249,8 @@ Dekorator okien dla KDE 4.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-QTLIB=%{_libdir}; export QTLIB
-QTDIR=%{_prefix}; export QTDIR
+export QTLIB=%{_libdir}
+export QTDIR=%{_prefix}
 %configure \
        --disable-static \
        --enable-librsvg \
@@ -274,6 +274,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/*.la
 %endif
 
+%if %{with gtk}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}
+desktop-file-install \
+       --vendor="" \
+       --dir $RPM_BUILD_ROOT%{_desktopdir} \
+       %{SOURCE2}
+%endif
+
 %find_lang %{name}
 
 %clean
@@ -379,7 +387,9 @@ done
 %if %{with gtk}
 %files gtk-decorator
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/compiz-gtk
 %attr(755,root,root) %{_bindir}/gtk-window-decorator
+%{_desktopdir}/compiz-gtk.desktop
 %if %{with gconf}
 %{_sysconfdir}/gconf/schemas/gwd.schemas
 %endif