rpms/xorg-x11-server/devel .cvsignore, 1.35, 1.36 commitid, 1.8, 1.9 make-git-snapshot.sh, 1.1, 1.2 sources, 1.30, 1.31 xorg-x11-server.spec, 1.299, 1.300 xserver-1.3.0-honor-displaysize.patch, 1.2, NONE xserver-1.3.0-randr12-config-hack.patch, 1.3, NONE xserver-1.3.0-xnest-exposures.patch, 1.2, NONE xserver-1.4.99-selinux-fix.patch, 1.1, NONE

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9515/devel

Modified Files:
	.cvsignore commitid make-git-snapshot.sh sources 
	xorg-x11-server.spec 
Removed Files:
	xserver-1.3.0-honor-displaysize.patch 
	xserver-1.3.0-randr12-config-hack.patch 
	xserver-1.3.0-xnest-exposures.patch 
	xserver-1.4.99-selinux-fix.patch 
Log Message:
yet another git snapshot.  vt switch works now, i promise.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	27 Feb 2008 17:02:34 -0000	1.35
+++ .cvsignore	4 Mar 2008 06:38:31 -0000	1.36
@@ -1 +1 @@
-xorg-server-20080227.tar.bz2
+xorg-server-20080303.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- commitid	27 Feb 2008 17:02:34 -0000	1.8
+++ commitid	4 Mar 2008 06:38:31 -0000	1.9
@@ -1 +1 @@
-d74b0327e8355546e6b41e8ce684f461d65fa9dc
+1bda57a41ea3bb3a624a5e75f421160ac98a0804


Index: make-git-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/make-git-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- make-git-snapshot.sh	12 Nov 2007 20:41:56 -0000	1.1
+++ make-git-snapshot.sh	4 Mar 2008 06:38:31 -0000	1.2
@@ -6,7 +6,7 @@
 git clone -n git://git.freedesktop.org/git/xorg/xserver $DIRNAME
 cd $DIRNAME
 if [ -z "$1" ]; then
-    git log | head -1
+    git checkout --track -b server-1.5-branch origin/server-1.5-branch
 else
     git checkout $1
 fi


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	27 Feb 2008 17:02:34 -0000	1.30
+++ sources	4 Mar 2008 06:38:31 -0000	1.31
@@ -1 +1 @@
-240a7d59f892bdbcd7fb098159e8c7f0  xorg-server-20080227.tar.bz2
+bbe69d049ba5bd8d764787e10a95dfd3  xorg-server-20080303.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- xorg-x11-server.spec	28 Feb 2008 21:53:32 -0000	1.299
+++ xorg-x11-server.spec	4 Mar 2008 06:38:31 -0000	1.300
@@ -15,12 +15,12 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20080227
+%define gitdate 20080303
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.4.99.1
-Release:   0.26.%{?gitdate}%{?dist}
+Version:   1.4.99.900
+Release:   0.27.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -36,10 +36,6 @@
 Source0:   ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
 %endif
 
-Patch10:   xserver-1.4.99-selinux-fix.patch
-# general bug fixes
-Patch19:   xserver-1.3.0-xnest-exposures.patch
-
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
 Patch101:  xserver-1.4.99-dont-backfill-bg-none.patch
@@ -53,8 +49,6 @@
 Patch1010:  xserver-1.3.0-no-prerelease-warning.patch
 Patch1014:  xserver-1.4.99-xaa-evict-pixmaps.patch
 
-Patch2004:  xserver-1.3.0-honor-displaysize.patch
-Patch2007:  xserver-1.3.0-randr12-config-hack.patch
 Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
 
 # Trivial things to maybe merge upstream at next rebase
@@ -272,7 +266,7 @@
 %setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
 %if 0%{gitdate}
-git checkout -b fedora-%{version}-%{release}
+git checkout -b fedora
 # make it something you can push to.
 sed -i 's/git/&+ssh/' .git/config
 %else
@@ -510,6 +504,9 @@
 
 
 %changelog
+* Mon Mar 03 2008 Adam Jackson <ajax at redhat.com> 1.4.99.900-0.27.20080303
+- Switch to 1.5 branch and rebase.
+
 * Thu Feb 28 2008 Jeremy Katz <katzj at redhat.com> - 1.4.99.1-0.26
 - Pull in another SELinux fix from upstream
 


--- xserver-1.3.0-honor-displaysize.patch DELETED ---


--- xserver-1.3.0-randr12-config-hack.patch DELETED ---


--- xserver-1.3.0-xnest-exposures.patch DELETED ---


--- xserver-1.4.99-selinux-fix.patch DELETED ---