rpms/xorg-x11-server/devel xorg-x11-server.spec,1.516,1.517

[Colin Walters]

Author: walters

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7022

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Wed Jul 14 2010 Colin Walters <walters at verbum.org> - 1.8.99.904-5
- Add patch from master which blocks gnome-shell development



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -p -r1.516 -r1.517
--- xorg-x11-server.spec	14 Jul 2010 20:46:11 -0000	1.516
+++ xorg-x11-server.spec	14 Jul 2010 20:49:23 -0000	1.517
@@ -30,7 +30,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.8.99.904
-Release:   4%{?gitdate:.%{gitdate}}%{dist}
+Release:   5%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -65,7 +65,7 @@ Patch103:  xserver-1.5.0-bg-none-root.pa
 
 Patch2014:  xserver-1.5.0-projector-fb-size.patch
 
-Patch3799: 0001-Unwrap-rewrap-EnterVT-LeaveVT-completely-Fixes-28998.patch
+Patch3799: xserver-1.8-entervt.patch
 
 # Trivial things to never merge upstream ever:
 # This really could be done prettier.
@@ -547,7 +547,7 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
-* Wed Jul 14 2010 Colin Walters <walters at verbum.org> - 1.8.99.904-4
+* Wed Jul 14 2010 Colin Walters <walters at verbum.org> - 1.8.99.904-5
 - Add patch from master which blocks gnome-shell development
 
 * Fri Jul 09 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.8.99.904-3