rpm/gdm
SHA256
1
0
Fork 0
forked from pool/gdm
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
OBS User unknown
2007-07-20 11:31:11 +00:00
committed by Git OBS Bridge
parent 6ea6a16420
commit 7c057a8b58
3 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
gdm-conf.patch
View File

@@ -1,6 +1,8 @@
--- gdm-2.15.7/config/gdm.conf.in Index: gdm-2.19.3/config/gdm.conf.in
+++ gdm-2.15.7/config/gdm.conf.in ===================================================================
@@ -61,11 +61,11 @@ --- gdm-2.19.3.orig/config/gdm.conf.in
+++ gdm-2.19.3/config/gdm.conf.in
@@ -68,11 +68,11 @@ TimedLoginDelay=30
# The greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to # The greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to
# get the new graphical greeter. # get the new graphical greeter.
@@ -14,7 +16,7 @@
# Launch the greeter with an additional list of colon separated GTK+ modules. # Launch the greeter with an additional list of colon separated GTK+ modules.
# This is useful for enabling additional feature support e.g. GNOME # This is useful for enabling additional feature support e.g. GNOME
@@ -79,10 +79,12 @@ @@ -86,10 +86,12 @@ TimedLoginDelay=30
# This value will be overridden with the value from /etc/default/login if it # This value will be overridden with the value from /etc/default/login if it
# contains "ROOT=<pathvalue>". # contains "ROOT=<pathvalue>".
#DefaultPath=@GDM_USER_PATH@ #DefaultPath=@GDM_USER_PATH@
@@ -27,17 +29,25 @@
# If you are having trouble with using a single server for a long time and want # If you are having trouble with using a single server for a long time and want
# GDM to kill/restart the server, turn this on. On Solaris, this value is # GDM to kill/restart the server, turn this on. On Solaris, this value is
@@ -121,6 +123,9 @@ @@ -126,9 +128,14 @@ XKeepsCrashing=@gdmconfdir@/XKeepsCrashi
#RebootCommand=@REBOOT_COMMAND@ #
#HaltCommand=@HALT_COMMAND@ # Reboot, Halt and suspend commands, you can add different commands separated
#SuspendCommand=@SUSPEND_COMMAND@ # by a semicolon. GDM will use the first one it can find.
-RebootCommand=@REBOOT_COMMAND@
-HaltCommand=@HALT_COMMAND@
-SuspendCommand=@SUSPEND_COMMAND@
+#RebootCommand=@REBOOT_COMMAND@
+#HaltCommand=@HALT_COMMAND@
+#SuspendCommand=@SUSPEND_COMMAND@
+
+RebootCommand=/sbin/shutdown -r now +RebootCommand=/sbin/shutdown -r now
+HaltCommand=/sbin/shutdown -h now +HaltCommand=/sbin/shutdown -h now
+SuspendCommand=/usr/bin/powersave --suspend-to-disk +SuspendCommand=/usr/bin/powersave --suspend-to-disk
# Probably should not touch the below this is the standard setup. +
ServAuthDir=@authdir@
# This is our standard startup script. A bit different from a normal X # The following options specify how GDM system commands are supported.
@@ -131,7 +136,7 @@ #
@@ -163,7 +170,7 @@ BaseXsession=@gdmconfdir@/Xsession
# really a PATH style variable since 2.4.4.2 to allow actual interoperability # really a PATH style variable since 2.4.4.2 to allow actual interoperability
# with KDM. Note that <dmconfdir>/Sessions is there for backwards # with KDM. Note that <dmconfdir>/Sessions is there for backwards
# compatibility reasons with 2.4.4.x. # compatibility reasons with 2.4.4.x.
@@ -46,16 +56,16 @@
# This is the default .desktop session. One of the ones in SessionDesktopDir # This is the default .desktop session. One of the ones in SessionDesktopDir
#DefaultSession=gnome.desktop #DefaultSession=gnome.desktop
# Better leave this blank and HOME will be used. You can use syntax ~/ below # Better leave this blank and HOME will be used. You can use syntax ~/ below
@@ -214,7 +219,7 @@ @@ -259,7 +266,7 @@ CheckDirOwner=true
# example, home directories owned by some other user. # If your HOME is managed by automounter, set to true
CheckDirOwner=true SupportAutomount=false
# Number of seconds to wait after a failed login # Number of seconds to wait after a failed login
-#RetryDelay=1 -#RetryDelay=1
+RetryDelay=1 +RetryDelay=1
# Maximum size of a file we wish to read. This makes it hard for a user to DoS # Maximum size of a file we wish to read. This makes it hard for a user to DoS
# us by using a large file. # us by using a large file.
#UserMaxFile=65536 #UserMaxFile=65536
@@ -275,17 +280,18 @@ @@ -320,17 +327,18 @@ Enable=false
#PingIntervalSeconds=15 #PingIntervalSeconds=15
# The port. 177 is the standard port so better keep it that way. # The port. 177 is the standard port so better keep it that way.
#Port=177 #Port=177
@@ -80,7 +90,7 @@
# The GTK+ theme to use for the GUI. # The GTK+ theme to use for the GUI.
#GtkTheme=Default #GtkTheme=Default
@@ -312,7 +318,7 @@ @@ -357,7 +365,7 @@ Enable=false
#TitleBar=true #TitleBar=true
# Don't allow user to move the standard login window. Only makes sense if # Don't allow user to move the standard login window. Only makes sense if
# TitleBar is on. # TitleBar is on.
@@ -89,7 +99,7 @@
# Set a position for the standard login window rather then just centering the # Set a position for the standard login window rather then just centering the
# window. If you enter negative values for the position it is taken as an # window. If you enter negative values for the position it is taken as an
# offset from the right or bottom edge. # offset from the right or bottom edge.
@@ -333,7 +339,7 @@ @@ -378,7 +386,7 @@ Browser=false
# User ID's less than the MinimalUID value will not be included in the face # User ID's less than the MinimalUID value will not be included in the face
# browser or in the gdmselection list for Automatic/Timed login. They will not # browser or in the gdmselection list for Automatic/Timed login. They will not
# be displayed regardless of the settings for Include and Exclude. # be displayed regardless of the settings for Include and Exclude.
@@ -98,7 +108,7 @@
# Users listed in Include will be included in the face browser and in the # Users listed in Include will be included in the face browser and in the
# gdmsetup selection list for Automatic/Timed login. Users should be separated # gdmsetup selection list for Automatic/Timed login. Users should be separated
# by commas. # by commas.
@@ -364,7 +370,7 @@ @@ -409,7 +417,7 @@ Browser=false
#ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png #ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png
# The standard greeter should shake if a user entered the wrong username or # The standard greeter should shake if a user entered the wrong username or
# password. Kind of cool looking # password. Kind of cool looking
@@ -107,7 +117,7 @@
# The Actions menu (formerly system menu) is shown in the greeter, this is the # The Actions menu (formerly system menu) is shown in the greeter, this is the
# menu that contains reboot, shutdown, suspend, config and chooser. None of # menu that contains reboot, shutdown, suspend, config and chooser. None of
@@ -401,12 +407,12 @@ @@ -446,12 +454,12 @@ DefaultRemoteWelcome=true
# Background settings for the standard greeter: # Background settings for the standard greeter:
# Type can be 0=None, 1=Image & Color, 2=Color, 3=Image # Type can be 0=None, 1=Image & Color, 2=Color, 3=Image
#BackgroundType=2 #BackgroundType=2
@@ -122,7 +132,7 @@
GraphicalThemedColor=#76848F GraphicalThemedColor=#76848F
# XDMCP session should only get a color, this is the sanest setting since you # XDMCP session should only get a color, this is the sanest setting since you
# don't want to take up too much bandwidth # don't want to take up too much bandwidth
@@ -448,7 +454,7 @@ @@ -493,7 +501,7 @@ GraphicalThemedColor=#76848F
# list then provide a list that is delimited by /: to the GraphicalThemes # list then provide a list that is delimited by /: to the GraphicalThemes
# key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme # key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme
# and specify just one theme. # and specify just one theme.
@@ -131,7 +141,7 @@
#GraphicalThemes=circles/:happygnome #GraphicalThemes=circles/:happygnome
GraphicalThemeDir=@datadir@/gdm/themes/ GraphicalThemeDir=@datadir@/gdm/themes/
GraphicalThemeRand=false GraphicalThemeRand=false
@@ -465,6 +471,7 @@ @@ -510,6 +518,7 @@ GraphicalThemeRand=false
# executable (see daemon/SoundProgram) it will play that file instead of just # executable (see daemon/SoundProgram) it will play that file instead of just
# beeping. # beeping.
#SoundOnLogin=true #SoundOnLogin=true
@@ -139,7 +149,7 @@
#SoundOnLoginFile= #SoundOnLoginFile=
# If SoundOnLoginSuccess, then the greeter will play a sound (as above) when a # If SoundOnLoginSuccess, then the greeter will play a sound (as above) when a
# user successfully logs in. # user successfully logs in.
@@ -552,7 +559,7 @@ @@ -597,7 +606,7 @@ Gestures=false
# Definition of the standard X server. # Definition of the standard X server.
[server-Standard] [server-Standard]
name=Standard server name=Standard server

5
gdm.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jul 19 22:40:53 CEST 2007 - maw@suse.de
- Reenable gdm-conf.patch (#292837).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 17 10:05:32 CEST 2007 - coolo@suse.de Tue Jul 17 10:05:32 CEST 2007 - coolo@suse.de

9
gdm.spec
View File

@@ -22,7 +22,7 @@ PreReq: %insserv_prereq
License: GPL v2 or later License: GPL v2 or later
Group: System/GUI/GNOME Group: System/GUI/GNOME
Version: 2.19.3 Version: 2.19.3
Release: 2 Release: 4
Summary: The GNOME 2.x Display Manager Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd Source1: gdm.pamd
@@ -31,7 +31,7 @@ Source2: gdm-autologin.pamd
Source3: SuSEconfig.gdm Source3: SuSEconfig.gdm
Source4: init.earlygdm Source4: init.earlygdm
Source5: sysconfig.displaymanager-gdm Source5: sysconfig.displaymanager-gdm
Patch: gdm-conf.patch Patch0: gdm-conf.patch
Patch1: %{name}-%{version}.diff Patch1: %{name}-%{version}.diff
Patch2: gdm-bash-profile.patch Patch2: gdm-bash-profile.patch
Patch3: gdm-language-dialog-size.patch Patch3: gdm-language-dialog-size.patch
@@ -79,8 +79,9 @@ Authors:
%prep %prep
%setup %setup
%patch1
gnome-patch-translation-prepare gnome-patch-translation-prepare
%patch0 -p1
%patch1
#%patch -p1 #%patch -p1
#%patch2 -p1 #%patch2 -p1
#%patch3 -p1 #%patch3 -p1
@@ -226,6 +227,8 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
%endif %endif
%changelog %changelog
* Thu Jul 19 2007 - maw@suse.de
- Reenable gdm-conf.patch (#292837).
* Tue Jul 17 2007 - coolo@suse.de * Tue Jul 17 2007 - coolo@suse.de
- fix pointer arithmetic - fix pointer arithmetic
* Mon Jul 16 2007 - mauro@suse.de * Mon Jul 16 2007 - mauro@suse.de