- up to 0.6.2

[packages/compiz.git] / compiz.spec

diff --git a/compiz.spec b/compiz.spec
index f92f546a414a5b2dbd1143af9a666ee14885a22e..104d4f05803834f81d003228624b7471c3d51cc0 100644 (file)
--- a/compiz.spec
+++ b/compiz.spec
@@ -9,12 +9,12 @@
 Summary:       OpenGL window and compositing manager
 Summary(pl.UTF-8):     OpenGL-owy zarządca okien i składania
 Name:          compiz
-Version:       0.5.4
+Version:       0.6.2
 Release:       1
 License:       GPL or MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.gz
-# Source0-md5: 04f88b85c15e02b4bd11cb9c2706707f
+# Source0-md5: 7e6edfdbf0dc46b135313440edae7a53
 Patch0:                %{name}-DESTDIR.patch
 URL:           http://xorg.freedesktop.org/
 %if %{with gconf} || %{with gtk}
@@ -34,6 +34,7 @@ BuildRequires:        libpng-devel
 BuildRequires: librsvg-devel >= 1:2.14.0
 BuildRequires: libtool
 BuildRequires: libxcb-devel
+BuildRequires: libxslt-devel
 BuildRequires: pkgconfig
 BuildRequires: startup-notification-devel >= 0.7
 BuildRequires: xorg-lib-libSM-devel
@@ -160,6 +161,7 @@ Requires(post,preun):       GConf2
 %endif
 Requires:      %{name} = %{version}-%{release}
 Obsoletes:     compiz-gnome-decorator
+Obsoletes:     heliodor
 
 %description gtk-decorator
 Window decorator for GTK+.
@@ -172,6 +174,7 @@ Summary:    Window decorator for KDE
 Summary(pl.UTF-8):     Dekorator okien dla KDE
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
+Obsoletes:     aquamarine
 
 %description kde-decorator
 Window decorator for KDE.
@@ -179,6 +182,9 @@ Window decorator for KDE.
 %description kde-decorator -l pl.UTF-8
 Dekorator okien dla KDE.
 
+# for gconf subpackage
+%define        plugins annotate blur clone core cube dbus decoration fade fs gconf glib ini inotify kconfig minimize move place plane png regex resize rotate scale screenshot svg switcher video water wobbly zoom
+
 %prep
 %setup -q
 %patch0 -p1
@@ -210,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.la
+%if %{with gnome}
+rm -f $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/*.la
+%endif
 
 %find_lang %{name}
 
@@ -220,10 +229,14 @@ rm -rf $RPM_BUILD_ROOT
 %postun        libs -p /sbin/ldconfig
 
 %post gconf
-%gconf_schema_install
+for p in %{plugins}; do
+       %gconf_schema_install compiz-$p.schemas
+done
 
 %preun gconf
-%gconf_schema_uninstall
+for p in %{plugins}; do
+       %gconf_schema_uninstall compiz-$p.schemas
+done
 
 %if %{with gconf}
 %post gtk-decorator
@@ -241,7 +254,8 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/compiz/libfs.so
 %{?with_gconf:%exclude %{_libdir}/compiz/libgconf.so}
 %{_datadir}/compiz
-%{?with_gconf:%exclude %{_datadir}/compiz/gconf.xml}
+%exclude %{_datadir}/compiz/fs.xml
+%exclude %{_datadir}/compiz/gconf.xml
 
 %files libs
 %defattr(644,root,root,755)
@@ -255,13 +269,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/compiz
 %{_pkgconfigdir}/compiz.pc
 %{_pkgconfigdir}/libdecoration.pc
-# what is the purpose of these files? development or runtime?
+# checked by compiz-fusion-plugins-extra
 %{_pkgconfigdir}/compiz-cube.pc
+# checked by compiz-fusion-plugins-main
 %{_pkgconfigdir}/compiz-scale.pc
 
 %files fuse
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/compiz/libfs.so
+%{_datadir}/compiz/fs.xml
 
 %if %{with gconf}
 %files gconf
@@ -269,14 +285,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/compiz/libgconf.so
 %{_sysconfdir}/gconf/schemas/compiz-*.schemas
 %{_datadir}/compiz/gconf.xml
-# what for?
+# checked by compiz-fusion-plugins-* (with non-default --enable-schemas only)
 %{_pkgconfigdir}/compiz-gconf.pc
 %endif
 
-%if %{with gnome}
+%if %{with gnome} && %{with gtk}
 %files gnome-settings
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/window-manager-settings/libcompiz.so
+%{_datadir}/wm-properties/compiz.desktop
 %endif
 
 %if %{with gtk}