SPECS: compiz.spec - disabled kde bcond and enabled kde4 bcond - updated %f...

[megabajt]

Author: megabajt                     Date: Tue Mar 24 19:52:55 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- disabled kde bcond and enabled kde4 bcond
- updated %files and gconf plugins list

---- Files affected:
SPECS:
   compiz.spec (1.108 -> 1.109) 

---- Diffs:

================================================================
Index: SPECS/compiz.spec
diff -u SPECS/compiz.spec:1.108 SPECS/compiz.spec:1.109
--- SPECS/compiz.spec:1.108	Sun Mar  8 16:57:52 2009
+++ SPECS/compiz.spec	Tue Mar 24 20:52:49 2009
@@ -5,8 +5,8 @@
 %bcond_without	gtk		# gtk window decorator
 %bcond_without	gnome		# gnome settings module
 %bcond_without	metacity	# metacity theme support
-%bcond_without	kde		# kde-window-decorator and kconfig
-%bcond_with	kde4		# kde4-window-decorator
+%bcond_with	kde		# kde-window-decorator and kconfig
+%bcond_without	kde4		# kde4-window-decorator
 #
 Summary:	OpenGL window and compositing manager
 Summary(pl.UTF-8):	OpenGL-owy zarządca okien i składania
@@ -50,17 +50,17 @@
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXres-devel
+BuildRequires:	xorg-lib-libXrender-devel >= 0.9.3
 %if %{with gtk}
 BuildRequires:	gtk+2-devel >= 2:2.8.0
-BuildRequires:	libwnck-devel >= 2.18.1
-BuildRequires:	xorg-lib-libXrender-devel >= 0.9.3
+BuildRequires:	libwnck-devel >= 2.20.0
 %if %{with gnome}
 BuildRequires:	gnome-control-center-devel >= 2.0
 BuildRequires:	gnome-desktop-devel >= 2.0
 BuildRequires:	gnome-menus-devel
 %endif
 %if %{with metacity}
-BuildRequires:	metacity-devel >= 2.18.0
+BuildRequires:	metacity-devel >= 2.24.0
 %endif
 %endif
 %if %{with kde}
@@ -232,7 +232,7 @@
 Dekorator okien dla KDE 4.
 
 # for gconf subpackage
-%define	plugins annotate blur clone core cube dbus decoration fade fs gconf glib ini inotify minimize move place 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 gnomecompat ini inotify minimize move obs place png regex resize rotate scale screenshot svg switcher video water wobbly zoom
 
 %prep
 %setup -q
@@ -263,7 +263,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	desktopfilesdir=%{_datadir}/gnome/wm-properties \
 	DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.la
@@ -369,7 +368,8 @@
 %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}/gnome/wm-properties/compiz.desktop
+%{_datadir}/gnome/wm-properties/compiz-wm.desktop
+%{_desktopdir}/compiz.desktop
 %endif
 
 %if %{with gtk}
@@ -399,6 +399,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109  2009/03/24 19:52:49  megabajt
+- disabled kde bcond and enabled kde4 bcond
+- updated %files and gconf plugins list
+
 Revision 1.108  2009/03/08 15:57:52  shadzik
 - 0.8.2
 
================================================================

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