SPECS: xorg-app-xdm.spec - sed calls replaced by config patch (+--...

[qboosh]

Author: qboosh                       Date: Sun Oct 15 00:23:47 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sed calls replaced by config patch (+--with-xdmauthdir configure option)
- fixed auth dir substitution, now it works
- release 0.6

---- Files affected:
SPECS:
   xorg-app-xdm.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/xorg-app-xdm.spec
diff -u SPECS/xorg-app-xdm.spec:1.18 SPECS/xorg-app-xdm.spec:1.19
--- SPECS/xorg-app-xdm.spec:1.18	Sun Oct 15 02:15:07 2006
+++ SPECS/xorg-app-xdm.spec	Sun Oct 15 02:23:42 2006
@@ -5,7 +5,7 @@
 Summary(uk):	íĹÎĹÄÖĹŇ ÄÉÓĐĚĹŔ X
 Name:		xorg-app-xdm
 Version:	1.1.0
-Release:	0.5
+Release:	0.6
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/app/xdm-%{version}.tar.bz2
@@ -17,6 +17,7 @@
 Source4:	xdm.sysconfig
 Patch0:		%{name}-Xsession.patch
 Patch1:		%{name}-pam_tty.patch
+Patch2:		%{name}-config.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -24,7 +25,6 @@
 BuildRequires:	libtool
 BuildRequires:	pam-devel
 BuildRequires:	pkgconfig >= 1:0.19
-BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libXaw-devel
 BuildRequires:	xorg-lib-libXdmcp-devel
 BuildRequires:	xorg-lib-libXinerama-devel
@@ -74,13 +74,7 @@
 %setup -q -n xdm-%{version} -a1
 %patch0 -p1
 %patch1 -p1
-
-sed -i -e 's:DEF_AUTH_DIR, XDMCONFIGDIR,:DEF_AUTH_DIR, /var/lib/xdm,:' configure.ac
-
-# fix old PLD configs
-sed -i -e 's:/usr/X11R6/bin:/usr/bin:' xdm-xinitrc-*/{Xsetup_0,GiveConsole,TakeConsole}
-# fix broken xorg paths
-sed -i -e 's:/usr/X11R6/bin:/usr/bin:' config/{Xstartup,Xreset}
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -96,6 +90,7 @@
 	--with-color-pixmap=xdm-pld-logo.xpm \
 	--with-default-vt=vt9 \
 	--with-pixmapdir=%{_sysconfdir}/X11/xdm/pixmaps \
+	--with-xdmauthdir=/var/lib/xdm \
 	--with-xdmconfigdir=%{_sysconfdir}/X11/xdm \
 	--with-xdmscriptdir=%{_sysconfdir}/X11/xdm
 
@@ -177,6 +172,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/10/15 00:23:42  qboosh
+- sed calls replaced by config patch (+--with-xdmauthdir configure option)
+- fixed auth dir substitution, now it works
+- release 0.6
+
 Revision 1.18  2006/10/15 00:15:07  qboosh
 - use PLD logos by default, release 0.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-app-xdm.spec?r1=1.18&r2=1.19&f=u