rpms/xorg-x11-xdm/devel xdm-1.0.1-redhat-xdm-config-fix.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.4, 1.5 xorg-x11-xdm.spec, 1.15, 1.16 xdm-0.99.3-redhat-xdm-config-fix.patch, 1.2, NONE xdm-0.99.3-xdm-app-defaults-in-datadir.patch, 1.1, NONE xdm-0.99.3-xdm-scripts-in-configdir.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-xdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2783/devel

Modified Files:
	.cvsignore sources xorg-x11-xdm.spec 
Added Files:
	xdm-1.0.1-redhat-xdm-config-fix.patch 
Removed Files:
	xdm-0.99.3-redhat-xdm-config-fix.patch 
	xdm-0.99.3-xdm-app-defaults-in-datadir.patch 
	xdm-0.99.3-xdm-scripts-in-configdir.patch 
Log Message:
auto-import xorg-x11-xdm-1.0.1-1 on branch devel from xorg-x11-xdm-1.0.1-1.src.rpm

xdm-1.0.1-redhat-xdm-config-fix.patch:
 xdm-config.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xdm-1.0.1-redhat-xdm-config-fix.patch ---
--- config/xdm-config.cpp.redhat-fix-xdm-config	2006-01-09 11:41:26.000000000 -0500
+++ config/xdm-config.cpp	2006-01-09 11:42:30.000000000 -0500
@@ -18,7 +18,7 @@
 DisplayManager.servers:		XDMCONFIGDIR/Xservers
 DisplayManager.accessFile:	XDMCONFIGDIR/Xaccess
 DisplayManager*resources:	XDMCONFIGDIR/Xresources
-DisplayManager.willing:		SU nobody -c XDMSCRIPTDIR/Xwilling
+DisplayManager.willing:		SU nobody -s /bin/bash XDMSCRIPTDIR/Xwilling
 ! All displays should use authorization, but we cannot be sure
 ! X terminals may not be configured that way, so they will require
 ! individual resource settings.


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Nov 2005 07:30:56 -0000	1.5
+++ .cvsignore	9 Jan 2006 16:54:34 -0000	1.6
@@ -1,2 +1 @@
-*.bz2
-clog
+xdm-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 00:15:11 -0000	1.4
+++ sources	9 Jan 2006 16:54:34 -0000	1.5
@@ -1 +1 @@
-99d9dbbbcc16726050ce09fd62b5c1e6  xdm-0.99.3.tar.bz2
+883c66b4ce39754b8111fa1e8bc0933c  xdm-1.0.1.tar.bz2


Index: xorg-x11-xdm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-xdm.spec	24 Nov 2005 16:40:34 -0000	1.15
+++ xorg-x11-xdm.spec	9 Jan 2006 16:54:34 -0000	1.16
@@ -17,14 +17,14 @@
 Name: xorg-x11-%{pkgname}
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
-Version: 0.99.3
-Release: 6
+Version: 1.0.1
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: %{pkgname}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
 Source1: Xsetup_0
 Source10: xdm.init
 Source11: xdm.pamd
@@ -37,11 +37,9 @@
 Source12: xdm-pre-audit-system.pamd
 Source13: xserver.pamd
 
-Patch0: xdm-0.99.3-xdm-app-defaults-in-datadir.patch
-Patch1: xdm-0.99.3-xdm-scripts-in-configdir.patch
 # NOTE: Change xdm-config to invoke Xwilling with "-s /bin/bash" instead
 # of "-c" to fix bug (#86505)
-Patch10: xdm-0.99.3-redhat-xdm-config-fix.patch
+Patch10: xdm-1.0.1-redhat-xdm-config-fix.patch
 
 BuildRequires: pkgconfig
 BuildRequires: libXaw-devel
@@ -93,8 +91,6 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
-%patch0 -p0 -b .xdm-app-defaults-in-datadir
-%patch1 -p0 -b .xdm-scripts-in-configdir
 %patch10 -p0 -b .redhat-xdm-config-fix
 
 %build
@@ -119,6 +115,7 @@
 	--disable-static \
 	--disable-xprint \
 	--with-xdmconfigdir=%{_sysconfdir}/X11/xdm \
+	--with-xdmscriptdir=%{_sysconfdir}/X11/xdm \
 	--with-pixmapdir=%{_datadir}/xdm/pixmaps
 
 make %{?_smp_mflags}
@@ -217,6 +214,11 @@
 %{_mandir}/man1x/*.1x*
 
 %changelog
+* Mon Jan  9 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-1
+- Updated xdm to version 1.0.1 from X11R7.
+- Added --with-xdmscriptdir option to ./configure to put scripts in /etc
+- Updated xdm-1.0.1-redhat-xdm-config-fix.patch to work with xdm 1.0.1
+
 * Thu Nov 24 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.3-6
 - Updated xdm.pamd to work with recent pam changes, and bumped the minimum
   pam requirement up to 0.78-0 for FC5 builds. (#170661)


--- xdm-0.99.3-redhat-xdm-config-fix.patch DELETED ---


--- xdm-0.99.3-xdm-app-defaults-in-datadir.patch DELETED ---


--- xdm-0.99.3-xdm-scripts-in-configdir.patch DELETED ---