File project4.diff of Package gnome-session

Overview Repositories Revisions Requests Users Attributes Meta

File project4.diff of Package gnome-session (Revision 32d7a6a39c064ec5ffea2dfb3549e7d5)

Currently displaying revision 32d7a6a39c064ec5ffea2dfb3549e7d5 , Show latest

--- gnome-session-compiz-as-default-wm.patch.orig
+++ gnome-session-compiz-as-default-wm.patch
@@ -2,15 +2,29 @@ Index: data/gnome-wm
 ===================================================================
 --- data/gnome-wm.orig
 +++ data/gnome-wm
-@@ -67,6 +67,11 @@ if [ -z "$WINDOW_MANAGER" ] ; then
+@@ -67,6 +67,12 @@ if [ -z "$WINDOW_MANAGER" ] ; then
  
    if [ -f "$COMPIZ_ENABLED_FILE" ] ; then
      KNOWN_WM="compiz-manager $KNOWN_WM"
 +  else
 +      # Check to see if hardware is supported by compiz, to have it as default WM if so
-+      if CM_DRY=yes compiz-manager; then
++      CM_DRY=yes compiz-manager > /dev/null 2>&1
++      if test $? -eq 0; then
 +	  KNOWN_WM="compiz-manager $KNOWN_WM"
 +      fi
    fi
  
    OLDIFS=$IFS
+Index: data/Makefile.am
+===================================================================
+--- data/Makefile.am	(revision 5076)
++++ data/Makefile.am	(working copy)
+@@ -25,6 +25,6 @@
+ bin_SCRIPTS = gnome-wm
+ 
+ settingsdir = $(datadir)/applications
+-settings_in_files = session-properties.desktop.in
++settings_in_files = gnome-wm.desktop.in session-properties.desktop.in
+ settings_DATA = $(settings_in_files:.desktop.in=.desktop)
+ 
+ install-data-local:
\ No newline at end of file
--- gnome-session.changes.orig
+++ gnome-session.changes
@@ -1,5 +1,11 @@
 -------------------------------------------------------------------
-Wed Sep 10 12:33:37 CEST 2008 - rodrigo@novell.com
+Wed Sep 10 14:16:33 CEST 2008 - rodrigo@suse.de
+
+- Updated gnome-session-compiz-as-default-wm.patch to be more
+  correct and to include gnome-wm.desktop file in the package
+
+-------------------------------------------------------------------
+Wed Sep 10 12:33:37 CEST 2008 - rodrigo@suse.de
 
 - Update to version 2.23.92:
   + Make all desktop files translatable (Vincent Untz)
--- gnome-session.spec.orig
+++ gnome-session.spec
@@ -170,6 +170,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/gnome-session/helpers
 %dir %{_datadir}/gnome-session
 %{_bindir}/*
+%{_datadir}/applications/gnome-wm.desktop
 %{_datadir}/applications/session-properties.desktop
 %{_datadir}/xsessions/*.desktop
 %{_datadir}/icons/hicolor/*/*/*.*

Places

File project4.diff of Package gnome-session (Revision 32d7a6a39c064ec5ffea2dfb3549e7d5)

Places