rpms/xorg-x11-server/F-11 .cvsignore, 1.59, 1.60 sources, 1.54, 1.55 xorg-x11-server.spec, 1.451, 1.452 xserver-1.6.0-randr-xinerama-crash.patch, 1.1, NONE xserver-1.6.0-restore-zap.patch, 1.1, NONE xserver-1.6.0-xinerama-cursors.patch, 1.1, NONE xserver-1.6.1-avoid-malloc-for-logging.patch, 1.1, NONE xserver-1.6.1-xkbsendmap.patch, 1.1, NONE

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18597

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Removed Files:
	xserver-1.6.0-randr-xinerama-crash.patch 
	xserver-1.6.0-restore-zap.patch 
	xserver-1.6.0-xinerama-cursors.patch 
	xserver-1.6.1-avoid-malloc-for-logging.patch 
	xserver-1.6.1-xkbsendmap.patch 
Log Message:
* Wed Jul 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.2-1
- xserver 1.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- .cvsignore	18 May 2009 18:40:18 -0000	1.59
+++ .cvsignore	8 Jul 2009 22:13:01 -0000	1.60
@@ -1 +1 @@
-xorg-server-1.6.1.901.tar.bz2
+xorg-server-1.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	18 May 2009 18:40:18 -0000	1.54
+++ sources	8 Jul 2009 22:13:01 -0000	1.55
@@ -1 +1 @@
-e6cba1f07006143daa95ce3f11d999b2  xorg-server-1.6.1.901.tar.bz2
+37641d0899df8a9c4a6284586d932b8d  xorg-server-1.6.2.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.451
retrieving revision 1.452
diff -u -p -r1.451 -r1.452
--- xorg-x11-server.spec	11 Jun 2009 05:40:28 -0000	1.451
+++ xorg-x11-server.spec	8 Jul 2009 22:13:01 -0000	1.452
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.6.1.901
-Release:   5%{?dist}
+Version:   1.6.2
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -91,21 +91,16 @@ Patch6016: xserver-1.6.1-nouveau.patch
 
 Patch6022: xserver-1.6.0-primary.patch
 
-Patch6024: xserver-1.6.0-xinerama-cursors.patch
-
 # ajax needs to upstream this
 Patch6027: xserver-1.6.0-displayfd.patch
 
-Patch6028: xserver-1.6.0-restore-zap.patch
 Patch6029: xserver-1.6.0-no-i810.patch
 
-Patch6030: xserver-1.6.0-randr-xinerama-crash.patch
 Patch6031: xserver-1.6.1-exa-avoid-swapped-out.patch
 Patch6032: xserver-1.6.1-randr-gamma.patch
 
 # Nominated for 1.6.2
 Patch6034: xserver-1.6.1-exa-create-pixmap2.patch
-Patch6035: xserver-1.6.1-avoid-malloc-for-logging.patch
 
 Patch6040: xserver-1.6.1-vt-switch.patch
 # from upstream, nominated for 1.6.2 (#499792)
@@ -113,8 +108,6 @@ Patch6041: xserver-1.6.1-synaptics.patch
 Patch6042: xserver-1.6.1-proc-cmdline.patch
 # second part to xserver-1.6.1-synaptics.patch
 Patch6043: xserver-1.6.1-mousedrivers.patch
-# #456376, patch from upstream
-Patch6044: xserver-1.6.1-xkbsendmap.patch
 # #492359, monitor doesn't set first detailed timing preferred bit
 Patch6045: xserver-1.6.1-pea-quirk.patch
 
@@ -143,7 +136,7 @@ BuildRequires: git-core
 BuildRequires: automake autoconf libtool pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.1.5
 
-BuildRequires: xorg-x11-proto-devel >= 7.4-10
+BuildRequires: xorg-x11-proto-devel >= 7.4-15
 
 BuildRequires: xorg-x11-xtrans-devel >= 1.2.2-1
 BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel
@@ -536,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 08 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.2-1
+- xserver 1.6.2
+
 * Thu Jun 11 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.1.901-5
 - xserver-1.6.1-nouveau.patch: fix detection of earlier chipsets
 


--- xserver-1.6.0-randr-xinerama-crash.patch DELETED ---


--- xserver-1.6.0-restore-zap.patch DELETED ---


--- xserver-1.6.0-xinerama-cursors.patch DELETED ---


--- xserver-1.6.1-avoid-malloc-for-logging.patch DELETED ---


--- xserver-1.6.1-xkbsendmap.patch DELETED ---