rpms/gdm/devel gdmsetup-path.patch,NONE,1.1 gdm.spec,1.268,1.269

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20347

Modified Files:
	gdm.spec 
Added Files:
	gdmsetup-path.patch 
Log Message:
make gdmsetup work with consolehelper and pam, again


gdmsetup-path.patch:

--- NEW FILE gdmsetup-path.patch ---
diff -up gdm-2.19.5/gui/gdmsetup.desktop.in.in.gdmsetup-path gdm-2.19.5/gui/gdmsetup.desktop.in.in
--- gdm-2.19.5/gui/gdmsetup.desktop.in.in.gdmsetup-path	2007-08-12 01:56:54.000000000 -0400
+++ gdm-2.19.5/gui/gdmsetup.desktop.in.in	2007-08-12 01:57:34.000000000 -0400
@@ -2,8 +2,8 @@
 Encoding=UTF-8
 _Name=Login Window
 _Comment=Configure GDM login window appearance and behavior
-TryExec=@sbindir@/gdmsetup
-Exec=@sbindir@/gdmsetup
+TryExec=@bindir@/gdmsetup
+Exec=@bindir@/gdmsetup
 Icon=gdm-setup
 StartupNotify=true
 Terminal=false


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- gdm.spec	6 Aug 2007 16:23:16 -0000	1.268
+++ gdm.spec	12 Aug 2007 06:03:54 -0000	1.269
@@ -17,7 +17,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.19.5
-Release: 6%{?dist}
+Release: 7%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -53,6 +53,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=457998
 Patch34: gdm-2.19.5-dont-warp-pointer-to-stylus.patch
 
+# make gdmsetup work with consolehelper
+Patch35: gdmsetup-path.patch
+
 Patch100: gdm-2.19.4-change-defaults.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -137,13 +140,14 @@
 %patch32 -p1 -b .a11y-fixes
 %patch33 -p1 -b .pass-ats-to-session
 %patch34 -p1 -b .dont-warp-pointer-to-stylus
+%patch35 -p1 -b .gdmsetup-path
 
 %patch100 -p1 -b .change-defaults
 
 %build
 cp -f %{SOURCE1} config/gdm
 cp -f %{SOURCE2} config/gdm-autologin
-cp -f %{SOURCE3} gdmsetup-pam
+cp -f %{SOURCE3} utils/gdmsetup-pam
 
 intltoolize --force --copy
 aclocal
@@ -354,6 +358,9 @@
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Sun Aug 12 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.5-7
+- Make gdmsetup work with consolehelper and pam again
+
 * Mon Aug  6 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.19.5-6
 - Require gnome-keyring-pam