OBS User unknown 2008-10-14 17:36:00 +00:00 committed by Git OBS Bridge
parent 78b2760add
commit 3db2d35eac
4 changed files with 32 additions and 23 deletions

View File

@ -1,8 +1,19 @@
Index: data/gnome-wm
===================================================================
--- data/gnome-wm.orig
================================================================================
--- data/Makefile.am
+++ data/Makefile.am
@@ -25,7 +25,7 @@
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:
--- data/gnome-wm
+++ data/gnome-wm
@@ -67,6 +67,12 @@ if [ -z "$WINDOW_MANAGER" ] ; then
@@ -73,6 +73,12 @@
if [ -f "$COMPIZ_ENABLED_FILE" ] ; then
KNOWN_WM="compiz-manager $KNOWN_WM"
@ -15,10 +26,8 @@ Index: data/gnome-wm
fi
OLDIFS=$IFS
Index: data/gnome-wm.desktop.in.in
===================================================================
--- data/gnome-wm.desktop.in.in (revision 5076)
+++ data/gnome-wm.desktop.in.in (working copy)
--- data/gnome-wm.desktop.in.in
+++ data/gnome-wm.desktop.in.in
@@ -3,6 +3,7 @@
Encoding=UTF-8
_Name=Window Manager
@ -27,16 +36,3 @@ Index: data/gnome-wm.desktop.in.in
X-GNOME-Autostart-Phase=WindowManager
X-GNOME-Provides=windowmanager
X-GNOME-Autostart-Notify=true
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:

View File

@ -1,6 +1,14 @@
diff -aur gnome-session-2.23.5.orig/gnome-session/gsm-resumed-app.c gnome-session-2.23.5/gnome-session/gsm-resumed-app.c
--- gnome-session-2.23.5.orig/gnome-session/gsm-resumed-app.c 2008-07-22 12:34:41.000000000 +0200
+++ gnome-session-2.23.5/gnome-session/gsm-resumed-app.c 2008-07-29 23:23:58.000000000 +0200
@@ -25,6 +25,7 @@
#include <sys/wait.h>
#include <glib.h>
+#include <string.h>
#include <X11/SM/SMlib.h>
@@ -213,6 +213,22 @@
char *key;
char *id;

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 14 18:58:43 CEST 2008 - meissner@suse.de
- added prototype
-------------------------------------------------------------------
Mon Oct 6 16:42:06 CEST 2008 - sbrabec@suse.cz

View File

@ -22,8 +22,6 @@ Name: gnome-session
BuildRequires: PolicyKit-gnome-devel
BuildRequires: control-center2-devel
BuildRequires: fdupes
BuildRequires: control-center2-devel
BuildRequires: fdupes
BuildRequires: gnome-common
BuildRequires: gnome-desktop-devel
BuildRequires: gnome-keyring-devel
@ -40,7 +38,7 @@ BuildRequires: update-desktop-files
License: GPL v2 or later; LGPL v2.1 or later
Group: System/GUI/GNOME
Version: 2.24.0
Release: 1
Release: 2
Summary: Session Tools for the GNOME 2.x Desktop
Url: http://www.gnome.org
Source: %{name}-%{version}.tar.bz2
@ -197,6 +195,8 @@ rm -rf $RPM_BUILD_ROOT
%files lang -f %{name}-2.0.lang
%changelog
* Tue Oct 14 2008 meissner@suse.de
- added prototype
* Mon Oct 06 2008 sbrabec@suse.cz
- Conflict with other branding providers (FATE#304881).
* Wed Sep 24 2008 maw@suse.de