auto-import xorg-x11-xinit-1.0.0-1 on branch devel from

xorg-x11-xinit-1.0.0-1.src.rpm

.cvsignore

@@ -1,2 +1 @@
-*.tar.bz2
-clog
+xinit-1.0.0.tar.bz2

Xsession

@@ -23,10 +23,10 @@ if [ -z "$GDMSESSION" ]; then
     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
 

sources

@@ -1 +1 @@
-4ab49af18d4c48a3cfc31ab59d248841  xinit-0.99.3.tar.bz2
+fbafaf085b60a29fc336db8dce766167  xinit-1.0.0.tar.bz2

xorg-x11-xinit.spec

@@ -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 @@ rm -rf $RPM_BUILD_ROOT
 %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@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@redhat.com> 0.99.3-6
 - Add "Requires: xauth" for startx, to fix bug (#173684)