From bc27e5352f8326d748c3a58189015747c4b195aba653a8d24b7c2540ef68eb50 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 9 Aug 2007 16:59:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=26 --- gdm-conf.patch | 2 +- gdm.changes | 7 +++ gdm.spec | 20 ++++---- init.earlygdm | 121 ------------------------------------------------- 4 files changed, 19 insertions(+), 131 deletions(-) delete mode 100644 init.earlygdm diff --git a/gdm-conf.patch b/gdm-conf.patch index 251cb33..f124c5e 100644 --- a/gdm-conf.patch +++ b/gdm-conf.patch @@ -51,7 +51,7 @@ diff -upr gdm-2.19.5-pre/config/gdm.conf.in gdm-2.19.5-post/config/gdm.conf.in # with KDM. Note that /Sessions is there for backwards # compatibility reasons with 2.4.4.x. -#SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/ -+SessionDesktopDir=/usr/share/xsessions/:@EXPANDED_SYSCONFDIR@/dm/Sessions/:@EXPANDED_DATADIR@/gdm/BuiltInSessions/ ++SessionDesktopDir=/usr/share/xsessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/ # 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 diff --git a/gdm.changes b/gdm.changes index bfefd41..b17ec13 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 7 18:54:42 CEST 2007 - jpr@suse.de + +- Split off a -lang subpackag +- Fix variable expansion in gdm-conf.patch (#255685) +- Remove earlygdm, replaced by earlyxdm (#285813) + ------------------------------------------------------------------- Sat Aug 4 07:27:30 CEST 2007 - maw@suse.de diff --git a/gdm.spec b/gdm.spec index 9235199..a79ebcf 100644 --- a/gdm.spec +++ b/gdm.spec @@ -22,14 +22,13 @@ PreReq: %insserv_prereq License: GPL v2 or later Group: System/GUI/GNOME Version: 2.19.5 -Release: 2 +Release: 5 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd Source2: gdm-autologin.pamd # FIXME: See FIXME in the script. Source3: SuSEconfig.gdm -Source4: init.earlygdm Source5: sysconfig.displaymanager-gdm Patch0: gdm-conf.patch Patch3: gdm-language-dialog-size.patch @@ -61,6 +60,7 @@ Obsoletes: gdm2 PreReq: xorg-x11 %endif Requires: gnome2-SuSE gnome-themes klogd xorg-x11-server-extra +Requires: %{name}-lang = %{version} %description This version of GDM, the GNOME display manager, is based on GTK2 and is @@ -76,6 +76,7 @@ Authors: Martin K. Petersen Alex Larsson +%lang_package %prep %setup gnome-patch-translation-prepare @@ -126,8 +127,6 @@ mv $RPM_BUILD_ROOT%{_sbindir}/gdm-binary $RPM_BUILD_ROOT%{_sbindir}/gdm mkdir -p $RPM_BUILD_ROOT/etc/pam.d cp %{S:1} $RPM_BUILD_ROOT/etc/pam.d/gdm cp %{S:2} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin -# Install earlygdm init script. -install -D -m 0744 %SOURCE4 $RPM_BUILD_ROOT/etc/init.d/earlygdm # Install PostLogin script. mv $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default.sample $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default # Install SuSEconfig script. @@ -172,9 +171,7 @@ rm -f etc/gdm/gdm_sysconfig.conf %post %if %suse_version < 1010 %{fillup_only -n displaymanager -s gdm} -%{fillup_and_insserv -npY displaymanager earlygdm} -%else -%{fillup_and_insserv -pY earlygdm} +%{fillup_and_insserv -npY displaymanager} %endif %if %suse_version <= 1020 sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/init.d/xdm @@ -186,7 +183,7 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i %postun %insserv_cleanup -%files -f %{name}.lang +%files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %dir %config %{_sysconfdir}/gdm @@ -214,7 +211,6 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i %{_prefix}/lib/gdm %attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm %attr(750,gdm,gdm) %dir %{_localstatedir}/log/gdm -/etc/init.d/earlygdm %config /etc/pam.d/* /sbin/conf.d/SuSEconfig.gdm %if %suse_version <1010 @@ -224,7 +220,13 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i %dir /usr/share/xsessions %endif +%files lang -f %{name}.lang + %changelog +* Tue Aug 07 2007 - jpr@suse.de +- Split off a -lang subpackag +- Fix variable expansion in gdm-conf.patch (#255685) +- Remove earlygdm, replaced by earlyxdm (#285813) * Sat Aug 04 2007 - maw@suse.de - Use %%fdupes - Uncomment out the rm in %%clean. diff --git a/init.earlygdm b/init.earlygdm deleted file mode 100644 index b0a4a51..0000000 --- a/init.earlygdm +++ /dev/null @@ -1,121 +0,0 @@ -#! /bin/sh -# Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany. -# All rights reserved. -# -# Author: Werner Fink , 2004 -# Stephan Kulow , 2004 -# Robert Love, 2005 -# -# Please send feedback to http://www.suse.de/feedback -# -# /etc/init.d/earlygdm -# -### BEGIN INIT INFO -# Provides: earlygdm -# Required-Start: earlysyslog earlykbd $local_fs -# Should-Start: gpm firstboot resmgr -# Required-Stop: -# Default-Start: 5 -# Default-Stop: -# Description: Quick X Display Manager -### END INIT INFO - -. /etc/rc.status -. /etc/sysconfig/displaymanager - -check_nfs() -{ - # Check if important mount point is NFS mounted - while read where what type options rest ; do - test "$type" = "nfs" || continue - case "$where" in - \#*|"") ;; - *) case "$options" in - *noauto*) ;; - *) case "$where" in - /usr*|/opt*|/home*) return 1 ;; - esac - esac - esac - done < /etc/fstab - - return 0 # False - default -} - -check_remote_autologin() -{ - if test -n "$DISPLAYMANAGER_AUTOLOGIN"; then - grep -q "^$DISPLAYMANAGER_AUTOLOGIN:" /etc/passwd || return 1 - fi - return 0 -} - -check_kbd() -{ - test -s /var/run/keymap - return -} - -check_syslog() -{ - . /etc/sysconfig/syslog - - case "$SYSLOG_DAEMON" in - syslog-ng) - config=/etc/syslog-ng/syslog-ng.conf - ;; - *) - config=/etc/syslog.conf - ;; - esac - - case "$SYSLOG_DAEMON" in - syslog-ng) - while read line ; do - case "$line" in - \#*|"") continue ;; - *udp\ *|*udp\(*) return 1 ;; - *tcp\ *|*tcp\(*) return 1 ;; - esac - done < ${config} - ;; - *) - while read select action ; do - case "$select" in \#*|"") continue ;; esac - case "$action" in *@*) return 1 ;; esac - done < ${config} - ;; - esac - - return 0 -} - -check() -{ - check_nfs || return 1 - check_kbd || return 1 - check_syslog || return 1 - check_remote_autologin || return 1 - # ... - return 0 -} - -# default -if test -z "$DISPLAYMANAGER" && test -x /usr/bin/gdm; then - DISPLAYMANAGER=gdm -fi - -case "$DISPLAYMANAGER" in - gdm|gnome|GDM|GNOME) ;; - *) exit 0;; -esac - -case "$1" in - start) - if test -x /sbin/preload && test -f /etc/preload.d/gdm; then - /sbin/preload /etc/preload.d/gdm - echo i! - fi - ;; - *) ;; -esac