pool/gnome-session
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=77

Browse Source
This commit is contained in:
OBS User unknown 2009-05-28 01:53:01 +00:00 committed by Git OBS Bridge
parent 0e8ccd964b
commit dc07c90f98
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnome-session-gnome-wm-compiz-manager.patch
View File

@ -1,9 +1,10 @@
diff -aurp gnome-session-2.22.1.1/gnome-session/gnome-wm gnome-session-2.22.1.1-patched/gnome-session/gnome-wm Index: gnome-session-2.26.1/data/gnome-wm
--- gnome-session-2.22.1.1/data/gnome-wm 2008-04-10 16:32:20.000000000 +0200 ===================================================================
+++ gnome-session-2.22.1.1-patched/data/gnome-wm 2008-05-13 09:15:37.539788000 +0200 --- gnome-session-2.26.1.orig/data/gnome-wm
@@ -39,22 +39,33 @@ done +++ gnome-session-2.26.1/data/gnome-wm
@@ -51,22 +51,33 @@ if [ "x$WINDOW_MANAGER" = "xgnome-wm" ];
# WINDOW_MANAGER overrides all WINDOW_MANAGER=""
fi
+# Migrate compiz to compiz-manager +# Migrate compiz to compiz-manager
+if [ "x$WINDOW_MANAGER" = "xcompiz" ]; then +if [ "x$WINDOW_MANAGER" = "xcompiz" ]; then
@ -30,7 +31,7 @@ diff -aurp gnome-session-2.22.1.1/gnome-session/gnome-wm gnome-session-2.22.1.1-
- KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm" - KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm"
- if [ $IS_X_COMPOSITED -eq 0 ] ; then - if [ $IS_X_COMPOSITED -eq 0 ] ; then
- KNOWN_WM="compiz beryl $KNOWN_WM" - KNOWN_WM="compiz beryl $KNOWN_WM"
+ if [ -f "$COMPIZ_ENABLED_FILE" ] ; then + if test -f "$COMPIZ_ENABLED_FILE" -a "$COMPIZ_ENABLED_FILE" -nt /etc/X11/xorg.conf; then
+ KNOWN_WM="compiz-manager $KNOWN_WM" + KNOWN_WM="compiz-manager $KNOWN_WM"
fi fi
- # metacity is still the default wm in GNOME - # metacity is still the default wm in GNOME
@ -42,7 +43,7 @@ diff -aurp gnome-session-2.22.1.1/gnome-session/gnome-wm gnome-session-2.22.1.1-
for wm in $KNOWN_WM ; do for wm in $KNOWN_WM ; do
IFS=":" IFS=":"
for dir in $PATH ; do for dir in $PATH ; do
@@ -65,6 +76,7 @@ if [ -z "$WINDOW_MANAGER" ] ; then @@ -77,6 +88,7 @@ if [ -z "$WINDOW_MANAGER" ] ; then
done done
IFS=$OLDIFS IFS=$OLDIFS
done done
@ -50,7 +51,7 @@ diff -aurp gnome-session-2.22.1.1/gnome-session/gnome-wm gnome-session-2.22.1.1-
else else
WINDOW_MANAGER=$DEFWM WINDOW_MANAGER=$DEFWM
fi fi
@@ -104,11 +116,7 @@ if [ ! -z "$SMID" ] ; then @@ -116,11 +128,7 @@ if [ ! -z "$SMID" ] ; then
OPT1=-i OPT1=-i
OPT2=$SMID OPT2=$SMID
;; ;;
@ -63,7 +64,7 @@ diff -aurp gnome-session-2.22.1.1/gnome-session/gnome-wm gnome-session-2.22.1.1-
OPT1=--sm-client-id OPT1=--sm-client-id
OPT2=$SMID OPT2=$SMID
;; ;;
@@ -116,18 +124,6 @@ if [ ! -z "$SMID" ] ; then @@ -128,18 +136,6 @@ if [ ! -z "$SMID" ] ; then
esac esac
fi fi

7
gnome-session.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 25 16:23:54 CEST 2009 - vuntz@novell.com
- Update gnome-session-gnome-wm-compiz-manager.patch to enable
compiz only if the compiz-enabled file is newer than
/etc/X11/xorg.conf
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 14 21:15:49 CEST 2009 - vuntz@novell.com Tue Apr 14 21:15:49 CEST 2009 - vuntz@novell.com

6
gnome-session.spec
View File

@ -33,7 +33,7 @@ BuildRequires: update-desktop-files
License: GPL v2 or later; LGPL v2.1 or later License: GPL v2 or later; LGPL v2.1 or later
Group: System/GUI/GNOME Group: System/GUI/GNOME
Version: 2.26.1 Version: 2.26.1
Release: 1 Release: 2
Summary: Session Tools for the GNOME 2.x Desktop Summary: Session Tools for the GNOME 2.x Desktop
Url: http://www.gnome.org Url: http://www.gnome.org
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
@ -183,6 +183,10 @@ rm -rf $RPM_BUILD_ROOT
##%endif ##%endif
%changelog %changelog
* Mon May 25 2009 vuntz@novell.com
- Update gnome-session-gnome-wm-compiz-manager.patch to enable
compiz only if the compiz-enabled file is newer than
/etc/X11/xorg.conf
* Tue Apr 14 2009 vuntz@novell.com * Tue Apr 14 2009 vuntz@novell.com
- Update to version 2.26.1: - Update to version 2.26.1:
+ Fix inhibitor dialog not showing the right action button when + Fix inhibitor dialog not showing the right action button when