rpms/xorg-x11-xinit/devel .cvsignore, 1.6, 1.7 Xsession, 1.1, 1.2 sources, 1.4, 1.5 xorg-x11-xinit.spec, 1.11, 1.12

[fedora-cvs-commits at redhat.com]

Author: mharris

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

Modified Files:
	.cvsignore Xsession sources xorg-x11-xinit.spec 
Log Message:
auto-import xorg-x11-xinit-1.0.0-1 on branch devel from xorg-x11-xinit-1.0.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Nov 2005 09:08:33 -0000	1.6
+++ .cvsignore	16 Dec 2005 18:55:15 -0000	1.7
@@ -1,2 +1 @@
-*.tar.bz2
-clog
+xinit-1.0.0.tar.bz2


Index: Xsession
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/Xsession,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Xsession	13 Nov 2005 06:22:11 -0000	1.1
+++ Xsession	16 Dec 2005 18:55:15 -0000	1.2
@@ -23,10 +23,10 @@
     fi
 fi
 
-if ! printenv PATH | grep -q /usr/X11R6/bin
-then
-	PATH="${PATH}":/usr/X11R6/bin
-fi
+#if ! printenv PATH | grep -q /usr/X11R6/bin
+#then
+#	PATH="${PATH}":/usr/X11R6/bin
+#fi
 
 SWITCHDESKPATH=/usr/share/switchdesk
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 00:28:09 -0000	1.4
+++ sources	16 Dec 2005 18:55:15 -0000	1.5
@@ -1 +1 @@
-4ab49af18d4c48a3cfc31ab59d248841  xinit-0.99.3.tar.bz2
+fbafaf085b60a29fc336db8dce766167  xinit-1.0.0.tar.bz2


Index: xorg-x11-xinit.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-xinit.spec	23 Nov 2005 02:25:56 -0000	1.11
+++ xorg-x11-xinit.spec	16 Dec 2005 18:55:15 -0000	1.12
@@ -2,14 +2,14 @@
 
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
-Version: 0.99.3
-Release: 6
+Version: 1.0.0
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC2/everything/%{pkgname}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{pkgname}-%{version}.tar.bz2
 Source10: xinitrc-common
 Source11: xinitrc
 Source12: Xclients
@@ -88,11 +88,15 @@
 %dir %{_sysconfdir}/X11/xinit/xinitrc.d
 %{_sysconfdir}/X11/xinit/xinitrc.d/*
 %dir %{_mandir}
-%dir %{_mandir}/man1x
-%{_mandir}/man1x/startx.1x*
-%{_mandir}/man1x/xinit.1x*
+%dir %{_mandir}/man1
+%{_mandir}/man1/startx.1x*
+%{_mandir}/man1/xinit.1x*
 
 %changelog
+* Fri Dec 16 2005 Mike A. Harris <mharris at redhat.com> 1.0.0-1
+- Updated to xinit 1.0.0 from X11R7 RC4.
+- Changed manpage dir from man1x to man1 to match upstream default.
+
 * Tue Nov 22 2005 Mike A. Harris <mharris at redhat.com> 0.99.3-6
 - Add "Requires: xauth" for startx, to fix bug (#173684)