SPECS: compiz.spec - corrected BRs - separated gnome-window-decora...

[wolf]

Author: wolf                         Date: Sat Feb 25 13:55:52 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- corrected BRs
- separated gnome-window-decorator, kde-window-decorator and gnome-settings
  to subpackages
- kde disabled by default

---- Files affected:
SPECS:
   compiz.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/compiz.spec
diff -u SPECS/compiz.spec:1.10 SPECS/compiz.spec:1.11
--- SPECS/compiz.spec:1.10	Thu Feb 23 18:20:31 2006
+++ SPECS/compiz.spec	Sat Feb 25 14:55:47 2006
@@ -1,7 +1,8 @@
 # $Revision$, $Date$
 #
-# TODO:
-# - separate gnome control-panel plugin (it doesn't seem to work anyway)
+# Conditional build:
+%bcond_without	gnome		# don't build gnome-window-decorator
+%bcond_with	kde		# build kde-window-decorator (currently not working)
 #
 Summary:	OpenGL window and compositing manager
 Summary(pl):	OpenGL-owy zarządca okien i składania
@@ -14,15 +15,27 @@
 Source0:	%{name}-%{_snap}.tar.bz2
 # Source0-md5:	107d69d6f1575ebb104c0f78eff3298e
 Patch0:		%{name}-switcher-all-desktops.patch
-BuildRequires:	QtCore-devel
-BuildRequires:	QtGui-devel
+BuildRequires:	GConf2-devel
+BuildRequires:	OpenGL-devel
+BuildRequires:	glib2-devel
+BuildRequires:	libpng-devel
+BuildRequires:	libsvg-cairo-devel
+BuildRequires:	startup-notification-devel
+BuildRequires:	xorg-lib-libXcomposite
+BuildRequires:	xorg-lib-libXdamage
+BuildRequires:	xorg-lib-libXrandr
+%if %{with gnome}
 BuildRequires:	avahi-glib-devel
 BuildRequires:	control-center-devel
 BuildRequires:	gnome-desktop-devel
 BuildRequires:	gnome-menus-devel
-BuildRequires:	libsvg-cairo-devel
 BuildRequires:	libwnck-devel
+%endif
+%if %{with kde}
+BuildRequires:	QtCore-devel
+BuildRequires:	QtGui-devel
 BuildRequires:	qt4-build
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,6 +62,42 @@
 %description devel -l pl
 Pliki nagłówkowe dla compiza.
 
+%package gnome-settings
+Summary:	Compiz settings for gnome control panel
+Summary(pl):	Ustawienia compiza dla panelu sterowania gnome
+Group:		X11
+Requires:	%{name} = %{version}-%{release}
+
+%description gnome-settings
+Compiz settings for gnome control panel.
+
+%description gnome-settings -l pl
+Ustawienia compiza dla panelu sterowania gnome.
+
+%package gnome-decorator
+Summary:	Window decorator for gnome
+Summary(pl):	Dekorator okien dla gnome
+Group:		X11
+Requires:	%{name} = %{version}-%{release}
+
+%description gnome-decorator
+Window decorator for gnome.
+
+%description gnome-decorator -l pl
+Dekorator okien dla gnome.
+
+%package kde-decorator
+Summary:	Window decorator for KDE
+Summary(pl):	Dekorator okien dla KDE
+Group:		X11
+Requires:	%{name} = %{version}-%{release}
+
+%description kde-decorator
+Window decorator for KDE.
+
+%description kde-decorator -l pl
+Dekorator okien dla KDE.
+
 %prep
 %setup -q -n %{name}-%{_snap}
 %patch0 -p1
@@ -59,8 +108,8 @@
 %configure \
 	--enable-svg \
 	--enable-libsvg-cairo \
-	--enable-gnome \
-	--enable-kde
+	--%{?with_gnome:en}%{!?with_gnome:dis}able-gnome \
+	--%{?with_kde:en}%{!?with_kde:dis}able-kde
 
 %{__make}
 
@@ -75,10 +124,9 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/compiz
 %dir %{_libdir}/compiz
 %attr(755,root,root) %{_libdir}/compiz/*.so
-%attr(755,root,root) %{_libdir}/window-manager-settings/*.so
 %{_datadir}/compiz
 %{_datadir}/gnome/wm-properties/*
 
@@ -87,12 +135,34 @@
 %{_includedir}/compiz
 %{_pkgconfigdir}/*
 
+%if %{with gnome}
+%files gnome-settings
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/window-manager-settings/*.so
+
+%files gnome-decorator
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gnome-window-decorator
+%endif
+
+%if %{with kde}
+%files kde-decorator
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/kde-window-decorator
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/02/25 13:55:47  wolf
+- corrected BRs
+- separated gnome-window-decorator, kde-window-decorator and gnome-settings
+  to subpackages
+- kde disabled by default
+
 Revision 1.10  2006/02/23 17:20:31  wolf
 - md5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/compiz.spec?r1=1.10&r2=1.11&f=u