Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=88f7ab40806a726c0912ebf3d858be31622824f0
commit 88f7ab40806a726c0912ebf3d858be31622824f0 Author: Christian Hamar alias krix <[EMAIL PROTECTED]> Date: Mon Sep 24 14:51:51 2007 +0200 gdm-2.20.0-1-x86_64 * Version bump * Updated patches. dropped unneccessary stuff diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild index cdc9e67..3cdfa4d 100644 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@ -2,12 +2,12 @@ # Maintainer: Christian Hamar alias krix <[EMAIL PROTECTED]> pkgname=gdm -pkgver=2.18.4 +pkgver=2.20.0 pkgrel=1 pkgdesc="GNOME Display Manager" url="http://www.gnome.org/"; backup=(etc/gdm/custom.conf) -depends=('zenity>=2.18.0' 'libgnomeui>=2.18.0' 'libxi' 'fontconfig' 'libxrandr' 'librsvg>=2.16.0' \ +depends=('zenity>=2.20.0' 'libgnomeui>=2.20.0' 'libxi' 'fontconfig' 'libxrandr' 'librsvg>=2.16.2' \ 'libxinerama' 'libxcursor' 'libxevie' 'xorg-server') rodepends=('xsm' 'sessreg' 'gksu' 'xmessage') makedepends=('intltool' 'gnome-doc-utils') @@ -17,15 +17,13 @@ Finclude gnome options=([EMAIL PROTECTED] 'force') source=([EMAIL PROTECTED] $pkgname-2.15.9-gdmconf.patch \ $pkgname-2.18.0-gksu.patch \ - gdm-2.17.6-no-X11R6.patch \ - $pkgname-2.18.1-desktop-fix-from-svn.patch \ http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-0.6-4.tar.bz2) build() { Fcd Fpatchall Fautoreconf - intltoolize --force --copy + intltoolize --force --copy || Fdie find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \; if [ -f omf.make ]; then sed -i -e 's/-scrollkeeper-update.*//' omf.make @@ -44,10 +42,8 @@ build() { mv $Fsrcdir/Frugalware $Fdestdir/usr/share/gdm/themes/Frugalware || Fdie } -sha1sums=('8bf2c8745d7c38f5f08641abed4ca103cad0ecb8' \ - '6caee2c3e8ee9248a2a7293f21670a0ccda5eeb5' \ +sha1sums=('73f7840180645b6a3da0f3c3ac0518c2b4aef1d6' \ + '809407f910e6aefe26a34211e215e5cc996575a0' \ 'a702961b7851b1e7c946fc8e3fb29bd1d807a02f' \ - '82bb42ae2217465196b8de03b18efcdd832ff137' \ - '35dd60c8a715c3eb645cfa4ccbbb2c9967401d3b' \ 'b6d8125f41f81d8d966e4120ed2fd390994d8ebb') # optimization OK diff --git a/source/gnome/gdm/gdm-2.15.9-gdmconf.patch b/source/gnome/gdm/gdm-2.15.9-gdmconf.patch index 4740f52..612ac9d 100644 --- a/source/gnome/gdm/gdm-2.15.9-gdmconf.patch +++ b/source/gnome/gdm/gdm-2.15.9-gdmconf.patch @@ -1,25 +1,25 @@ -diff -urN gdm-2.15.9/config/gdm.conf.in gdm-2.15.9.new/config/gdm.conf.in ---- gdm-2.15.9/config/gdm.conf.in 2006-08-03 18:36:26.000000000 +0100 -+++ gdm-2.15.9.new/config/gdm.conf.in 2006-08-19 08:05:28.000000000 +0100 -@@ -67,7 +67,7 @@ +diff -Naur gdm-2.20.0.orig/config/gdm.conf.in gdm-2.20.0/config/gdm.conf.in +--- gdm-2.20.0.orig/config/gdm.conf.in 2007-09-24 14:25:20.000000000 +0200 ++++ gdm-2.20.0/config/gdm.conf.in 2007-09-24 14:28:49.000000000 +0200 +@@ -68,7 +68,7 @@ - # The greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to - # get the new graphical greeter. + # The greeter for attached (non-xdmcp) logins. Change gdmlogin to gdmgreeter + # to get the new graphical greeter. [EMAIL PROTECTED]@/gdmlogin [EMAIL PROTECTED]@/gdmgreeter # The greeter for xdmcp logins, usually you want a less graphically intensive # greeter here so it's better to leave this with gdmlogin -@@ -98,7 +98,7 @@ - # User and group used for running GDM GUI applicaitons. By default this is set +@@ -99,7 +99,7 @@ + # User and group used for running GDM GUI applications. By default this is set # to user "gdm" and group "gdm". This user/group should have very limited - # permissions and access to ony the gdm directories and files. + # permissions and access to only the gdm directories and files. -User=gdm +User=nobody Group=gdm # To try to kill all clients started at greeter time or in the Init script. -@@ -137,7 +137,7 @@ +@@ -163,7 +163,7 @@ # really a PATH style variable since 2.4.4.2 to allow actual interoperability # with KDM. Note that <dmconfdir>/Sessions is there for backwards # compatibility reasons with 2.4.4.x. @@ -28,9 +28,9 @@ diff -urN gdm-2.15.9/config/gdm.conf.in gdm-2.15.9.new/config/gdm.conf.in # This is the default .desktop session. One of the ones in SessionDesktopDir #DefaultSession=gnome.desktop # Better leave this blank and HOME will be used. You can use syntax ~/ below -@@ -165,8 +165,8 @@ +@@ -202,8 +202,8 @@ # Automatic VT allocation. Right now only works on Linux. This way we force - # X to use specific vts. turn VTAllocation to false if this is causing + # X to use specific vts. Turn VTAllocation to false if this is causing # problems. -#FirstVT=7 -#VTAllocation=true @@ -39,7 +39,7 @@ diff -urN gdm-2.15.9/config/gdm.conf.in gdm-2.15.9.new/config/gdm.conf.in # Should double login be treated with a warning (and possibility to change VT's # on Linux and FreeBSD systems for console logins) #DoubleLoginWarning=true -@@ -205,7 +205,7 @@ +@@ -242,7 +242,7 @@ [security] # Allow root to login. It makes sense to turn this off for kiosk use, when # you want to minimize the possibility of break in. @@ -48,7 +48,7 @@ diff -urN gdm-2.15.9/config/gdm.conf.in gdm-2.15.9.new/config/gdm.conf.in # Allow login as root via XDMCP. This value will be overridden and set to # false if the /etc/default/login file exists and contains # "CONSOLE=/dev/login", and set to true if the /etc/default/login file exists -@@ -294,7 +294,7 @@ +@@ -352,7 +352,7 @@ [EMAIL PROTECTED]@/themes/Default/gtk-2.0/gtkrc # The GTK+ theme to use for the GUI. @@ -57,7 +57,7 @@ diff -urN gdm-2.15.9/config/gdm.conf.in gdm-2.15.9.new/config/gdm.conf.in # If to allow changing the GTK+ (widget) theme from the greeter. Currently # this only affects the standard greeter as the graphical greeter does not yet # have this ability. -@@ -441,10 +441,10 @@ +@@ -499,10 +499,10 @@ # where the session saving stuff is disabled in GDM #ShowLastSession=true # Always use 24 hour clock no matter what the locale. @@ -70,7 +70,7 @@ diff -urN gdm-2.15.9/config/gdm.conf.in gdm-2.15.9.new/config/gdm.conf.in # Do not show any visible feedback in the password field. This is standard for # instance in console, xdm and ssh. #UseInvisibleInEntry=false -@@ -454,7 +454,7 @@ +@@ -512,7 +512,7 @@ # list then provide a list that is delimited by /: to the GraphicalThemes # key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme # and specify just one theme. @@ -79,7 +79,7 @@ diff -urN gdm-2.15.9/config/gdm.conf.in gdm-2.15.9.new/config/gdm.conf.in #GraphicalThemes=circles/:happygnome [EMAIL PROTECTED]@/gdm/themes/ GraphicalThemeRand=false -@@ -470,7 +470,7 @@ +@@ -528,7 +528,7 @@ # user input. If SoundOnLogin is a file and the greeter finds the 'play' # executable (see daemon/SoundProgram) it will play that file instead of just # beeping. @@ -88,8 +88,8 @@ diff -urN gdm-2.15.9/config/gdm.conf.in gdm-2.15.9.new/config/gdm.conf.in #SoundOnLoginFile= # If SoundOnLoginSuccess, then the greeter will play a sound (as above) when a # user successfully logs in. -@@ -558,7 +558,7 @@ - # Definition of the standard X server. +@@ -629,7 +629,7 @@ + [server-Standard] name=Standard server [EMAIL PROTECTED]@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ @@ -97,7 +97,7 @@ diff -urN gdm-2.15.9/config/gdm.conf.in gdm-2.15.9.new/config/gdm.conf.in flexible=true # Indicates that the X server should be started at a different process # priority. Values can be any integer value accepted by the setpriority C -@@ -573,7 +573,7 @@ +@@ -644,7 +644,7 @@ [server-Terminal] name=Terminal server # Add -terminate to make things behave more nicely @@ -106,7 +106,7 @@ diff -urN gdm-2.15.9/config/gdm.conf.in gdm-2.15.9.new/config/gdm.conf.in # Make this not appear in the flexible servers (we need extra params anyway, # and terminate would be bad for xdmcp choosing). You can make a terminal # server flexible, but not with an indirect query. If you need flexible -@@ -587,7 +587,7 @@ +@@ -658,7 +658,7 @@ # command line. [server-Chooser] name=Chooser server diff --git a/source/gnome/gdm/gdm.install b/source/gnome/gdm/gdm.install index 2c654a4..c8ead64 100644 --- a/source/gnome/gdm/gdm.install +++ b/source/gnome/gdm/gdm.install @@ -2,7 +2,7 @@ post_install() { chown -R nobody:gdm /var/gdm &> /dev/null echo -n "updating scrollkeeper catalogue... " - scrollkeeper-update -p /var/lib/scrollkeeper > /dev/null 2>&1 + rarian-sk-update -q > /dev/null 2>&1 echo "done." sed -i 's|usr/bin/gdm|usr/sbin/gdm|' /etc/sysconfig/desktop sed -i 's|usr/sbin/gdm -nodaemon|usr/sbin/gdm --nodaemon|' /etc/sysconfig/desktop @@ -17,7 +17,7 @@ post_upgrade() post_remove() { echo -n "updating scrollkeeper catalogue... " - scrollkeeper-update -p /var/lib/scrollkeeper > /dev/null 2>&1 + rarian-sk-update -q > /dev/null 2>&1 echo "done." sed -i 's|^desktop="/usr/sbin/gdm --nodaemon"$|#desktop="/usr/sbin/gdm --nodaemon"|' /etc/sysconfig/desktop } _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
