- c/p

[packages/compiz.git] / compiz.spec

diff --git a/compiz.spec b/compiz.spec
index ff7e27cb67f08bb201e11358d8cdca52a3d5853c..7b5ffd8cdc75c3d0528231a65d1130f7ae15ebc6 100644 (file)
--- a/compiz.spec
+++ b/compiz.spec
@@ -4,7 +4,7 @@
 %bcond_without gtk             # gtk window decorator
 %bcond_without gnome           # gnome settings module
 %bcond_without metacity        # metacity theme support
-%bcond_without kde             # kde-window-decorator
+%bcond_without kde             # kde-window-decorator and kconfig
 %bcond_with    kde4            # kde4-window-decorator
 #
 Summary:       OpenGL window and compositing manager
@@ -12,7 +12,7 @@ Summary(pl.UTF-8):    OpenGL-owy zarządca okien i składania
 Name:          compiz
 # note that even versions are STABLE
 Version:       0.7.4
-Release:       1
+Release:       2
 License:       GPL or MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.gz
@@ -74,7 +74,6 @@ BuildRequires:        kde4-kdelibs-devel
 BuildRequires: kde4-kdebase-workspace-devel
 %endif
 Requires:      %{name}-libs = %{version}-%{release}
-Obsoletes:     compiz-kconfig
 Obsoletes:     compiz-opacity
 Conflicts:     xorg-xserver-xgl < 0.0.20060505
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -152,6 +151,18 @@ 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 (KDE control backend).
+
+%description kconfig -l pl.UTF-8
+Wtyczka kconfig dla Compiza (backend sterujący oparty na KDE).
+
 %package svg
 Summary:       SVG plugin for Compiz
 Summary(pl.UTF-8):     Wtyczka SVG dla Compiza
@@ -291,6 +302,7 @@ done
 %attr(755,root,root) %{_bindir}/compiz
 %attr(755,root,root) %{_libdir}/compiz/*.so
 %exclude %{_libdir}/compiz/libfs.so
+%{?with_kde:%exclude %{_libdir}/compiz/libkconfig.so}
 %{?with_gconf:%exclude %{_libdir}/compiz/libgconf.so}
 %exclude %{_libdir}/compiz/libsvg.so
 %{_datadir}/compiz/*.xml
@@ -335,6 +347,14 @@ done
 %{_pkgconfigdir}/compiz-gconf.pc
 %endif
 
+%if %{with kde}
+%files kconfig
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/compiz/libkconfig.so
+%{_datadir}/config/compizrc
+%{_datadir}/config.kcfg/*.kcfg
+%endif
+
 %files svg
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/compiz/libsvg.so
@@ -362,8 +382,6 @@ done
 %files kde-decorator
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kde-window-decorator
-%{_datadir}/config.kcfg/*.kcfg
-%{_datadir}/config/compizrc
 %endif
 
 %if %{with kde4}