- up to 0.6.2

[packages/compiz.git] / compiz.spec

diff --git a/compiz.spec b/compiz.spec
index 901d3631f4d3167de6d8b746f22af28fb2ccecf3..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
-Release:       2
+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
@@ -139,18 +140,6 @@ GConf plugin for Compiz (GConf control backend).
 %description gconf -l pl.UTF-8
 Wtyczka GConf dla Compiza (backend sterujący oparty na GConfie).
 
-%package kconfig
-Summary:       Kconfig plugin for Compiz
-Summary(pl.UTF-8):     Wtyczka Kconfig dla Compiza
-Group:         X11/Applications
-Requires:      %{name} = %{version}-%{release}
-
-%description kconfig
-Kconfig plugin for Compiz (Kconfig control backend).
-
-%description kconfig -l pl.UTF-8
-Wtyczka Kconfig dla Compiza (backend sterujący oparty na Kconfigu).
-
 %package gnome-settings
 Summary:       Compiz settings for GNOME control panel
 Summary(pl.UTF-8):     Ustawienia compiza dla panelu sterowania GNOME
@@ -172,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+.
@@ -184,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.
@@ -191,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
@@ -235,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
@@ -255,11 +253,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/compiz/*.so
 %exclude %{_libdir}/compiz/libfs.so
 %{?with_gconf:%exclude %{_libdir}/compiz/libgconf.so}
-%{?with_kde:%exclude %{_libdir}/compiz/libkconfig.so}
 %{_datadir}/compiz
 %exclude %{_datadir}/compiz/fs.xml
 %exclude %{_datadir}/compiz/gconf.xml
-%exclude %{_datadir}/compiz/kconfig.xml
 
 %files libs
 %defattr(644,root,root,755)
@@ -293,18 +289,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/compiz-gconf.pc
 %endif
 
-%if %{with kde}
-%files kconfig
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/compiz/libkconfig.so
-%{_datadir}/compiz/kconfig.xml
-%{_datadir}/config.kcfg/compiz-*.kcfg
-%{_datadir}/config/compizrc
-# what for?
-%{_pkgconfigdir}/compiz-kconfig.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