rpms/compiz-manager/devel compiz-manager-0.6.0.diff, 1.2, 1.3 compiz-manager.spec, 1.2, 1.3

[Adel Gadllah (drago01)]

Author: drago01

Update of /cvs/pkgs/rpms/compiz-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13606

Modified Files:
	compiz-manager-0.6.0.diff compiz-manager.spec 
Log Message:
update to work with kde4

compiz-manager-0.6.0.diff:

Index: compiz-manager-0.6.0.diff
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-manager/devel/compiz-manager-0.6.0.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compiz-manager-0.6.0.diff	15 Nov 2007 16:52:20 -0000	1.2
+++ compiz-manager-0.6.0.diff	24 Mar 2008 19:44:28 -0000	1.3
@@ -1,5 +1,6 @@
---- compiz-manager	2007-10-24 17:03:09.000000000 +0200
-+++ compiz-manager.new	2007-10-24 17:03:01.000000000 +0200
+diff -upNr compiz-manager-0.6.0.orign/compiz-manager compiz-manager-0.6.0/compiz-manager
+--- compiz-manager-0.6.0.orign/compiz-manager	2007-10-15 21:10:06.000000000 +0200
++++ compiz-manager-0.6.0/compiz-manager	2008-03-24 20:38:23.000000000 +0100
 @@ -26,17 +26,28 @@
  # started, and start a default plugin and possibly window decorator.
  # 
@@ -33,7 +34,7 @@
  
  # Minimum amount of memory (in kilo bytes) that nVidia cards need
  # to be allowed to start
-@@ -45,9 +56,14 @@
+@@ -45,9 +56,14 @@ NVIDIA_MEMORY="65536" # 64MB
  NVIDIA_SETTINGS="nvidia-settings" # Assume it's in the path by default
  
  # For detecting what driver is in use, the + is for one or more /'s
@@ -50,7 +51,7 @@
  FALLBACKWM_OPTIONS="--replace $@"
  
  # Driver whitelist
-@@ -65,8 +81,8 @@
+@@ -65,8 +81,8 @@ COMPIZ_OPTIONS="--ignore-desktop-hints -
  COMPIZ_PLUGINS=""
  ENV=""
  
@@ -61,7 +62,7 @@
  
  # No indirect by default
  INDIRECT="no"
-@@ -262,14 +278,14 @@
+@@ -262,14 +278,14 @@ running_under_whitelisted_driver()
  # check pciid blacklist
  have_blacklisted_pciid()
  {
@@ -78,15 +79,22 @@
  	verbose "Detected PCI ID for VGA: $OUTPUT\n"
  	return 1
  }
-@@ -378,6 +394,13 @@
- 	verbose "Starting kde-window-decorator\n"
- 	${COMPIZ_BIN_PATH}kde-window-decorator --replace &
+@@ -374,10 +390,17 @@ if [ -x ${COMPIZ_BIN_PATH}emerald ] && [
+ elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then
+ 	verbose "Starting gtk-window-decorator\n"
+ 	${COMPIZ_BIN_PATH}gtk-window-decorator --replace &
+-elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then
+-	verbose "Starting kde-window-decorator\n"
+-	${COMPIZ_BIN_PATH}kde-window-decorator --replace &
++elif [ -x ${COMPIZ_BIN_PATH}kde4-window-decorator ] && [ -n "$KDE_FULL_SESSION" ]; then
++	verbose "Starting kde4-window-decorator\n"
++	${COMPIZ_BIN_PATH}kde4-window-decorator --replace &
  	FALLBACKWM="${KWIN}"
 +elif [ -x ${COMPIZ_BIN_PATH}emerald ]; then
 +	verbose "Starting emerald\n"
 +	${COMPIZ_BIN_PATH}emerald --replace &
 +# Abort completely instead of having no window decoration
-+elif [ ! -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ ! -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ ! -x ${COMPIZ_BIN_PATH}emerald ]; then
++elif [ ! -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ ! -x ${COMPIZ_BIN_PATH}kde4-window-decorator ] && [ ! -x ${COMPIZ_BIN_PATH}emerald ]; then
 +	echo "No decoration manager found. Aborting..."
 +	exit 1
  fi


Index: compiz-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-manager/devel/compiz-manager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compiz-manager.spec	15 Nov 2007 16:52:20 -0000	1.2
+++ compiz-manager.spec	24 Mar 2008 19:44:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           compiz-manager
 Version:        0.6.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A wrapper script to start compiz with proper options
 
 Group:          Applications/System
@@ -27,7 +27,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 
 cp -p %{SOURCE1} COPYING
 
@@ -46,6 +46,9 @@
 %{_bindir}/compiz-manager
 
 %changelog
+* Mon Mar 28 2008 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.0-5
+- Update patch to work with with kde4
+
 * Thu Nov 15 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.0-4
 - update patch: recognize corrected driver path