SPECS: compiz.spec - Obsoletes for removed subpackage - added miss...

[megabajt]

Author: megabajt                     Date: Sun Oct 21 10:15:57 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Obsoletes for removed subpackage
- added missing files

---- Files affected:
SPECS:
   compiz.spec (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: SPECS/compiz.spec
diff -u SPECS/compiz.spec:1.80 SPECS/compiz.spec:1.81
--- SPECS/compiz.spec:1.80	Sun Oct 21 09:42:46 2007
+++ SPECS/compiz.spec	Sun Oct 21 12:15:52 2007
@@ -23,9 +23,9 @@
 %endif
 BuildRequires:	Mesa-libGL-devel >= 6.5-1.20060411.2
 BuildRequires:	autoconf >= 2.57
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.7
 BuildRequires:	cairo-devel >= 1.0
-BuildRequires:	dbus-devel >= 0.35
+BuildRequires:	dbus-glib-devel
 BuildRequires:	glib2-devel >= 2.0
 # <sys/inotify.h>
 BuildRequires:	glibc-devel >= 6:2.4
@@ -34,8 +34,10 @@
 BuildRequires:	libpng-devel
 BuildRequires:	librsvg-devel >= 1:2.14.0
 BuildRequires:	libtool
+BuildRequires:	libxml2-devel
 BuildRequires:	libxcb-devel
 BuildRequires:	libxslt-devel
+BuildRequires:	libxslt-progs
 BuildRequires:	pkgconfig
 BuildRequires:	startup-notification-devel >= 0.7
 BuildRequires:	xorg-lib-libSM-devel
@@ -47,7 +49,6 @@
 %if %{with gtk}
 BuildRequires:	gtk+2-devel >= 2:2.8.0
 BuildRequires:	libwnck-devel >= 2.18.1
-BuildRequires:	pango-devel >= 1.10.0
 BuildRequires:	xorg-lib-libXrender-devel >= 0.9.3
 %if %{with gnome}
 BuildRequires:	control-center-devel >= 2.0
@@ -55,7 +56,7 @@
 BuildRequires:	gnome-menus-devel
 %endif
 %if %{with metacity}
-BuildRequires:	metacity-devel >= 2.17.0
+BuildRequires:	metacity-devel >= 2.18.0
 %endif
 %endif
 %if %{with kde}
@@ -66,6 +67,7 @@
 %endif
 Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	beryl-core
+Obsoletes:	compiz-kconfig
 Obsoletes:	compiz-opacity
 Conflicts:	xorg-xserver-xgl < 0.0.20060505
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -184,7 +186,7 @@
 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
+%define	plugins annotate blur clone core cube dbus decoration fade fs gconf glib ini inotify minimize move place plane png regex resize rotate scale screenshot svg switcher video water wobbly zoom
 
 %prep
 %setup -q
@@ -294,6 +296,8 @@
 %files gnome-settings
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/window-manager-settings/libcompiz.so
+%{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml
+%{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml
 %{_datadir}/wm-properties/compiz.desktop
 %endif
 
@@ -318,6 +322,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2007/10/21 10:15:52  megabajt
+- Obsoletes for removed subpackage
+- added missing files
+
 Revision 1.80  2007/10/21 07:42:46  rotom
 - up to 0.6.2
 - thx to Piotr Grymkowski
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/compiz.spec?r1=1.80&r2=1.81&f=u