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=37

Browse Source
This commit is contained in:
OBS User unknown 2008-04-11 20:53:04 +00:00 committed by Git OBS Bridge
parent 2d47d34fe4
commit 7434b5ddc9
6 changed files with 80 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-session-2.22.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae426a2f356012aea1086dca89e0551d6970c404a56e31b814a53e24eab19939
size 778868

3
gnome-session-2.22.1.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d30cc06bfa92f373577761ab56f718c146c6b207614746094ea4412f514f9384
size 773504

22
gnome-session-include-unistd.patch Normal file
View File

@ -0,0 +1,22 @@
=== modified file 'gnome-session/migrate-trash.c'
Index: gnome-session/migrate-trash.c
===================================================================
--- gnome-session/migrate-trash.c.orig
+++ gnome-session/migrate-trash.c
@@ -33,6 +33,7 @@
#include <errno.h>
#include <fcntl.h>
#include <string.h>
+#include <unistd.h>
#include <glib.h>
#include <glib/gstdio.h>
@@ -289,7 +290,7 @@ migrate_trash (void)
return 1;
}
- while (file = g_dir_read_name (dir))
+ while ((file = g_dir_read_name (dir)))
{
had_problem = !move_file (old_trash_dir, file, info_dir, files_dir)
|| had_problem;

52
gnome-session-motd.patch
View File

@ -1,5 +1,7 @@
--- /dev/null 2006-02-06 19:14:42.000000000 +0100 Index: gnome-session/gsm-motd.h
+++ gnome-session/gsm-motd.h 2006-02-03 12:30:48.000000000 +0100 ===================================================================
--- /dev/null
+++ gnome-session/gsm-motd.h
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+#ifndef GSM_MOTD_H +#ifndef GSM_MOTD_H
+#define GSM_MOTD_H +#define GSM_MOTD_H
@ -8,8 +10,10 @@
+void gsm_motd_stop (void); +void gsm_motd_stop (void);
+ +
+#endif +#endif
--- /dev/null 2006-02-06 19:14:42.000000000 +0100 Index: gnome-session/gsm-motd.c
+++ gnome-session/gsm-motd.c 2006-02-15 14:57:58.000000000 +0100 ===================================================================
--- /dev/null
+++ gnome-session/gsm-motd.c
@@ -0,0 +1,179 @@ @@ -0,0 +1,179 @@
+/* gdm-motd.c - Message of the Day support in gnome-session. +/* gdm-motd.c - Message of the Day support in gnome-session.
+ +
@ -190,18 +194,10 @@
+ motd_contents = NULL; + motd_contents = NULL;
+ } + }
+} +}
? depcomp
? stamp-h1
? gnome-session/gsm-motd.c
? gnome-session/gsm-motd.h
? po/stamp-it
Index: gnome-session/Makefile.am Index: gnome-session/Makefile.am
=================================================================== ===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/Makefile.am,v --- gnome-session/Makefile.am.orig
retrieving revision 1.108 +++ gnome-session/Makefile.am
diff -u -p -r1.108 Makefile.am
--- gnome-session/Makefile.am 10 Jan 2005 16:36:40 -0000 1.108
+++ gnome-session/Makefile.am 15 Feb 2006 14:01:55 -0000
@@ -4,6 +4,7 @@ defaultdir = $(datadir)/gnome @@ -4,6 +4,7 @@ defaultdir = $(datadir)/gnome
INCLUDES = \ INCLUDES = \
@ -210,7 +206,7 @@ diff -u -p -r1.108 Makefile.am
$(STANDARD_PROPERTIES_CFLAGS) \ $(STANDARD_PROPERTIES_CFLAGS) \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \
@@ -26,7 +27,7 @@ STANDARD_PROPERTIES_CFLAGS = @@ -25,7 +26,7 @@ STANDARD_PROPERTIES_CFLAGS =
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
$(NULL) $(NULL)
@ -219,7 +215,7 @@ diff -u -p -r1.108 Makefile.am
gnome_session_save_LDADD = $(GNOME_SESSION_LIBS) gnome_session_save_LDADD = $(GNOME_SESSION_LIBS)
gnome_session_remove_LDADD = $(GNOME_SESSION_LIBS) gnome_session_remove_LDADD = $(GNOME_SESSION_LIBS)
gnome_session_properties_LDADD = $(GNOME_SESSION_LIBS) gnome_session_properties_LDADD = $(GNOME_SESSION_LIBS)
@@ -95,6 +96,8 @@ gnome_session_SOURCES = \ @@ -83,6 +84,8 @@ gnome_session_SOURCES = \
gsm-keyring.h \ gsm-keyring.h \
gsm-gsd.c \ gsm-gsd.c \
gsm-gsd.h \ gsm-gsd.h \
@ -230,28 +226,26 @@ diff -u -p -r1.108 Makefile.am
gsm-remote-desktop.c \ gsm-remote-desktop.c \
Index: gnome-session/main.c Index: gnome-session/main.c
=================================================================== ===================================================================
RCS file: /cvs/gnome/gnome-session/gnome-session/main.c,v --- gnome-session/main.c.orig
retrieving revision 1.70 +++ gnome-session/main.c
diff -u -p -r1.70 main.c @@ -53,6 +53,7 @@
--- gnome-session/main.c 30 Oct 2005 11:26:31 -0000 1.70 #include "gsm-keyring.h"
+++ gnome-session/main.c 15 Feb 2006 14:01:56 -0000
@@ -48,6 +48,7 @@
#include "gsm-xrandr.h"
#include "gsm-at-startup.h" #include "gsm-at-startup.h"
#include "gsm-remote-desktop.h" #include "gsm-remote-desktop.h"
+#include "gsm-motd.h" +#include "gsm-motd.h"
#include "migrate-trash.h"
/* Flag indicating autosave - user won't be prompted on logout to /* Flag indicating autosave - user won't be prompted on logout to
* save the session */ @@ -668,8 +669,12 @@ main (int argc, char *argv[])
@@ -465,7 +466,11 @@ main (int argc, char *argv[])
if (a_t_support) /* the ATs are happier if the session has started */ migrate_trash();
gsm_assistive_technologies_start ();
+ gsm_motd_start (); + gsm_motd_start ();
+ +
gtk_main (); gtk_main ();
+
+ gsm_motd_stop ();
+ gsm_motd_stop ();
+
gsm_remote_desktop_cleanup (); gsm_remote_desktop_cleanup ();
gsm_sound_logout ();

8
gnome-session.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Apr 11 16:03:52 CEST 2008 - maw@suse.de
- Update to version 2.22.1.1:
+ Migrate Trash files to the new trash location (and fix a bug
therein)
+ Updated translations.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 28 15:38:26 CET 2008 - rodrigo@suse.de Fri Mar 28 15:38:26 CET 2008 - rodrigo@suse.de

40
gnome-session.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gnome-session (Version 2.22.0) # spec file for package gnome-session (Version 2.22.1.1)
# #
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -15,8 +15,8 @@ Name: gnome-session
BuildRequires: control-center2-devel fdupes gnome-common gnome-desktop-devel gnome-keyring-devel gnome-patch-translation gnome-settings-daemon-devel hicolor-icon-theme intltool libglade2-devel libnotify-devel perl-XML-Parser tcpd-devel update-desktop-files BuildRequires: control-center2-devel fdupes gnome-common gnome-desktop-devel gnome-keyring-devel gnome-patch-translation gnome-settings-daemon-devel hicolor-icon-theme intltool libglade2-devel libnotify-devel perl-XML-Parser tcpd-devel 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.22.0 Version: 2.22.1.1
Release: 13 Release: 1
Summary: Session Tools for the GNOME 2.x Desktop Summary: Session Tools for the GNOME 2.x Desktop
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: gnome Source1: gnome
@ -52,6 +52,8 @@ Patch17: gnome-session-gcc4.3-fixes.patch
Url: http://www.gnome.org Url: http://www.gnome.org
#PATCH-FIX-OPENSUSE gnome-session-parse-autostart-command-line.patch bnc180126 rodrigo@novell.com -- this is a temporary patch, remove when we update to the new gnome-session (2.23/2.24) #PATCH-FIX-OPENSUSE gnome-session-parse-autostart-command-line.patch bnc180126 rodrigo@novell.com -- this is a temporary patch, remove when we update to the new gnome-session (2.23/2.24)
Patch18: gnome-session-parse-autostart-command-line.patch Patch18: gnome-session-parse-autostart-command-line.patch
# PATCH-FIX-UPSTREAM gnome-session-include-unistd.patch maw@novell.com -- Vincent says he'll accept this soon
Patch19: gnome-session-include-unistd.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: control-center2 Recommends: control-center2
Obsoletes: gnome-core Obsoletes: gnome-core
@ -124,6 +126,7 @@ gnome-patch-translation-prepare
#%patch16 #%patch16
%patch17 -p1 %patch17 -p1
%patch18 %patch18
%patch19 -p0
gnome-patch-translation-update gnome-patch-translation-update
%build %build
@ -178,6 +181,11 @@ rm -rf $RPM_BUILD_ROOT
%files lang -f %{name}-2.0.lang %files lang -f %{name}-2.0.lang
%changelog %changelog
* Fri Apr 11 2008 maw@suse.de
- Update to version 2.22.1.1:
+ Migrate Trash files to the new trash location (and fix a bug
therein)
+ Updated translations.
* Fri Mar 28 2008 rodrigo@suse.de * Fri Mar 28 2008 rodrigo@suse.de
- Added gnome-session-parse-autostart-command-line.patch to deal - Added gnome-session-parse-autostart-command-line.patch to deal
correctly with placeholders in command lines (bnc#180126) correctly with placeholders in command lines (bnc#180126)
@ -236,7 +244,7 @@ rm -rf $RPM_BUILD_ROOT
- Updated gnome script to detect live install user and create - Updated gnome script to detect live install user and create
desktop entires in the ~/.config/autostart directory to disable desktop entires in the ~/.config/autostart directory to disable
beagle and opensuse-updater applets. Bug #326801 beagle and opensuse-updater applets. Bug #326801
* Wed Sep 19 2007 cgaisford@novell.com * Thu Sep 20 2007 cgaisford@novell.com
- Updated gnome script to create live install desktop file if the - Updated gnome script to create live install desktop file if the
system is booted into a live install configuration. Also depends system is booted into a live install configuration. Also depends
on an update to the gnome2-SuSE package which contains the desktop on an update to the gnome2-SuSE package which contains the desktop
@ -244,7 +252,7 @@ rm -rf $RPM_BUILD_ROOT
* Wed Sep 19 2007 mauro@suse.de * Wed Sep 19 2007 mauro@suse.de
- Update to version 2.20.0 - Update to version 2.20.0
+ Updated translations + Updated translations
* Fri Sep 14 2007 cgaisford@novell.com * Sat Sep 15 2007 cgaisford@novell.com
- Modified the gnome script to copy the SuSE.desktop file to the - Modified the gnome script to copy the SuSE.desktop file to the
desktop which points to the greeter app #300773 desktop which points to the greeter app #300773
* Thu Sep 13 2007 jpr@suse.de * Thu Sep 13 2007 jpr@suse.de
@ -258,7 +266,7 @@ rm -rf $RPM_BUILD_ROOT
- Update to versino 2.19.92: - Update to versino 2.19.92:
+ Fix compiz support in gnome-wm + Fix compiz support in gnome-wm
+ Updated translations. + Updated translations.
* Fri Sep 07 2007 lewing@suse.de * Sat Sep 08 2007 lewing@suse.de
- Copy GnomeOnlineHelp.desktop to ~/Desktop the first time 10.3 - Copy GnomeOnlineHelp.desktop to ~/Desktop the first time 10.3
runs. Part of bnc #300773 runs. Part of bnc #300773
* Fri Sep 07 2007 cgaisford@novell.com * Fri Sep 07 2007 cgaisford@novell.com
@ -283,7 +291,7 @@ rm -rf $RPM_BUILD_ROOT
if they are not available. Fix for Novell Bug 238299 if they are not available. Fix for Novell Bug 238299
- Included patch to fix up load time that is pending review - Included patch to fix up load time that is pending review
upstream. I'll add it to the spec file once approved upstream. I'll add it to the spec file once approved
* Tue Aug 07 2007 maw@suse.de * Wed Aug 08 2007 maw@suse.de
- Use %%fdupes - Use %%fdupes
- Split off a -lang subpackage. - Split off a -lang subpackage.
* Sat Aug 04 2007 dreveman@suse.de * Sat Aug 04 2007 dreveman@suse.de
@ -485,7 +493,7 @@ rm -rf $RPM_BUILD_ROOT
* Mon Jan 08 2007 sbrabec@suse.cz * Mon Jan 08 2007 sbrabec@suse.cz
- Prefix changed to /usr. - Prefix changed to /usr.
- Spec file cleanup. - Spec file cleanup.
* Fri Dec 22 2006 federico@novell.com * Sat Dec 23 2006 federico@novell.com
- Removed the part of /usr/bin/gnome that overwrites the - Removed the part of /usr/bin/gnome that overwrites the
/desktop/gnome/font_rendering/dpi setting in GConf upon the user's /desktop/gnome/font_rendering/dpi setting in GConf upon the user's
first login. With an updated control-center2 package, first login. With an updated control-center2 package,
@ -529,7 +537,7 @@ rm -rf $RPM_BUILD_ROOT
- Fix edition of startup programs containing a space in a command line - Fix edition of startup programs containing a space in a command line
argument argument
- Add gnome-keyring dependency - Add gnome-keyring dependency
* Tue Aug 01 2006 danw@suse.de * Wed Aug 02 2006 danw@suse.de
- If the session explicitly specifies metacity or compiz, but - If the session explicitly specifies metacity or compiz, but
the "wrong" X server for that wm is running, switch back to the "wrong" X server for that wm is running, switch back to
gnome-wm. #180506 gnome-wm. #180506
@ -541,9 +549,9 @@ rm -rf $RPM_BUILD_ROOT
migration from previous versions (#169509) migration from previous versions (#169509)
* Fri Jun 02 2006 gekker@suse.de * Fri Jun 02 2006 gekker@suse.de
- Fix pager on upgrade (#181264) - Fix pager on upgrade (#181264)
* Wed May 31 2006 jpr@suse.de * Thu Jun 01 2006 jpr@suse.de
- Don't run the migration script for new users (#179332) - Don't run the migration script for new users (#179332)
* Wed May 24 2006 joeshaw@suse.de * Thu May 25 2006 joeshaw@suse.de
- Fix the gnome script to not break when setting the background on - Fix the gnome script to not break when setting the background on
multihead setups. Patch from Erik Jacobsen. (bnc #178388) multihead setups. Patch from Erik Jacobsen. (bnc #178388)
* Sun May 21 2006 jpr@suse.de * Sun May 21 2006 jpr@suse.de
@ -560,7 +568,7 @@ rm -rf $RPM_BUILD_ROOT
- Update gnome-wm to pick metacity or compiz based on whether it's - Update gnome-wm to pick metacity or compiz based on whether it's
actually running under Xgl or not, regardless of what actually running under Xgl or not, regardless of what
/etc/sysconfig/displaymanager says. Fixes Xnest logins. #170839. /etc/sysconfig/displaymanager says. Fixes Xnest logins. #170839.
* Tue May 02 2006 joeshaw@suse.de * Wed May 03 2006 joeshaw@suse.de
- Don't write out a font using raw XML to the gconf database, - Don't write out a font using raw XML to the gconf database,
that's wrong and evil. Instead, try to set the desktop's DPI that's wrong and evil. Instead, try to set the desktop's DPI
value using gconftool-2. (bnc #171096) value using gconftool-2. (bnc #171096)
@ -573,7 +581,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Apr 13 2006 sbrabec@suse.cz * Thu Apr 13 2006 sbrabec@suse.cz
- Call %%suse_update_desktop_file. - Call %%suse_update_desktop_file.
- Use new control-center Categories instead of old ones. - Use new control-center Categories instead of old ones.
* Fri Apr 07 2006 danw@suse.de * Sat Apr 08 2006 danw@suse.de
- Patch gnome-wm to prefer compiz when Xgl is running - Patch gnome-wm to prefer compiz when Xgl is running
* Wed Apr 05 2006 hpj@suse.de * Wed Apr 05 2006 hpj@suse.de
- Fix keyring unlock patch to use g_strlcpy() correctly again. - Fix keyring unlock patch to use g_strlcpy() correctly again.
@ -756,7 +764,7 @@ rm -rf $RPM_BUILD_ROOT
- Don't run beagle unless ~/.runbeagle exists (#74029) - Don't run beagle unless ~/.runbeagle exists (#74029)
* Sat Mar 19 2005 jody@suse.de * Sat Mar 19 2005 jody@suse.de
- Enable suspend if it is available. (#73000) - Enable suspend if it is available. (#73000)
* Thu Mar 17 2005 clahey@suse.de * Fri Mar 18 2005 clahey@suse.de
- Patch fixes freeze on login. - Patch fixes freeze on login.
* Wed Mar 16 2005 sbrabec@suse.cz * Wed Mar 16 2005 sbrabec@suse.cz
- Fixed gnome-session-desktop-file.patch (#73047). - Fixed gnome-session-desktop-file.patch (#73047).
@ -767,7 +775,7 @@ rm -rf $RPM_BUILD_ROOT
* Mon Mar 07 2005 gekker@suse.de * Mon Mar 07 2005 gekker@suse.de
- mv suseplugger to default-apps patch - mv suseplugger to default-apps patch
- launch netapplet, resapplet, and best on startup - launch netapplet, resapplet, and best on startup
* Fri Feb 25 2005 gekker@suse.de * Sat Feb 26 2005 gekker@suse.de
- Add launch wrapper to launch beagled if installed in file gnome - Add launch wrapper to launch beagled if installed in file gnome
* Wed Feb 09 2005 sbrabec@suse.cz * Wed Feb 09 2005 sbrabec@suse.cz
- Added session desktop file. - Added session desktop file.
@ -798,7 +806,7 @@ rm -rf $RPM_BUILD_ROOT
* Fri Sep 10 2004 hhetter@suse.de * Fri Sep 10 2004 hhetter@suse.de
- run use_default_session again to make the 9.2 distribution - run use_default_session again to make the 9.2 distribution
wallpapers accessible wallpapers accessible
* Thu Sep 09 2004 federico@ximian.com * Fri Sep 10 2004 federico@ximian.com
- Added gnome-session-remove-purge-timeout.diff, to fix - Added gnome-session-remove-purge-timeout.diff, to fix
http://bugzilla.gnome.org/show_bug.cgi?id=151664 http://bugzilla.gnome.org/show_bug.cgi?id=151664
- Changed gnome-session-suseplugger.patch to run suseplugger with - Changed gnome-session-suseplugger.patch to run suseplugger with