From c0dd61005ec6e462321868593d3f82d68e1875182bcb74ed99a516c00b5612ee Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 7 Aug 2009 14:57:45 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=80

---
 gdm.changes |  7 +++++++
 gdm.spec    | 23 ++---------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/gdm.changes b/gdm.changes
index 62d2b6a..6f39328 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug  6 14:50:14 CEST 2009 - vuntz@novell.com
+
+- Remove old cleanup instructions for /var/lib/gdm/*.log* in pre.
+- Do not try to grep /sbin/conf.d/SuSEconfig.gdm in pre, if the
+  file doesn't exist. Fix bnc#508511.
+
 -------------------------------------------------------------------
 Fri Jul 31 20:45:30 CEST 2009 - vuntz@novell.com
 
diff --git a/gdm.spec b/gdm.spec
index 8b2399e..4bdc49f 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -41,7 +41,7 @@ BuildRequires:  zenity
 License:        GPL v2 or later
 Group:          System/GUI/GNOME
 Version:        2.27.4
-Release:        1
+Release:        2
 Summary:        The GNOME 2.x Display Manager
 Source:         %{name}-%{version}.tar.bz2
 Source1:        gdm.pamd
@@ -104,14 +104,6 @@ suited for the GNOME 2.x Desktop. GDM is a flexible X Window System
 display manager that has many options, is usable for remote login, and
 provides a good looking graphical interface.
 
-
-
-Authors:
---------
-    George (Jiri) Lebl <jirka@5z.com>
-    Martin K. Petersen <mkp@mkp.net>
-    Alex Larsson <alexl@redhat.com>
-
 %package branding-upstream
 License:        GPL v2 or later
 Summary:        The GNOME 2.x Display Manager
@@ -130,14 +122,6 @@ suited for the GNOME 2.x Desktop. GDM is a flexible X Window System
 display manager that has many options, is usable for remote login, and
 provides a good looking graphical interface.
 
-
-
-Authors:
---------
-    George (Jiri) Lebl <jirka@5z.com>
-    Martin K. Petersen <mkp@mkp.net>
-    Alex Larsson <alexl@redhat.com>
-
 %lang_package
 %prep
 %setup -q
@@ -211,13 +195,10 @@ rm -rf $RPM_BUILD_ROOT
 /usr/sbin/usermod -g gdm -G gdm -s /bin/false gdm 2> /dev/null
 # Remove old gdm_sysconfig.conf to update custom.conf from sysconfig settings.
 rm -f etc/gdm/gdm_sysconfig.conf
-# Remove old logs (#56205). Last created in SLEC8&9.0, first deleted in 9.2&SLED10.
-# Can be removed after SLES11:
-rm -f var/lib/gdm/*.log*
 # Fix incorrect interpretation of DISPLAYMANAGER_PASSWORD_LESS_LOGIN (#307566).
 # Last done in SLED10&10.1, first fixed in 10.3.
 # Can be removed after SLES12:
-if grep -q gdm-autologin sbin/conf.d/SuSEconfig.gdm ; then
+if test -f sbin/conf.d/SuSEconfig.gdm && grep -q gdm-autologin sbin/conf.d/SuSEconfig.gdm ; then
     if grep -q '^DISPLAYMANAGER_PASSWORD_LESS_LOGIN="no"' etc/sysconfig/displaymanager ; then
 	sed 's/^\(auth[[:space:]][[:space:]]*\)include[[:space:]]\([[:space:]]*\)common-auth/\1required\2pam_permit.so/' <etc/pam.d/gdm-autologin >etc/pam.d/gdm-autologin.new
 	if cmp -s etc/pam.d/gdm-autologin etc/pam.d/gdm-autologin.new ; then