Wed Feb 25 20:37:33 UTC 2009

Author: ajax

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

Modified Files:
	.cvsignore import.log sources xorg-x11-server.spec xvfb-run.sh 
Added Files:
	find-provides 
Removed Files:
	commitid make-git-snapshot.sh 
	xserver-1.4.99-builtin-fonts.patch 
	xserver-1.5.0-edid-backport.patch 
	xserver-1.5.0-exa-master-fix-x11perf-crash.patch 
	xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch 
	xserver-1.5.0-hide-cursor.patch 
	xserver-1.5.1-exa-fix-glyph-segfault.patch 
	xserver-1.5.1-xgi.patch xserver-1.5.2-exa-master-upgrade.patch 
	xserver-1.5.2-more-sanity-checks.patch 
	xserver-1.5.99.3-ddx-rules.patch 
	xserver-1.5.99.3-offscreen-pixmaps.patch 
	xserver-1.5.99.902-listen-for-hal.patch 
	xserver-1.5.99.903-fontmod.h 
	xserver-1.5.99.903-glx-visual-score.patch 
Log Message:
xserver 1.6.0

--- NEW FILE find-provides ---
#!/bin/sh
#
# Extract ABI versions from the .pc file.  Filter out xserver modules.
#
# Copyright 2009 Red Hat, Inc.
# License: MIT

abis=`grep ^abi "$1" | tr '_=.' '-- '`
echo $abis | while read major minor; do
    echo "xserver($major) = $minor"
done

shift

# exec "$@" | grep -v '\.so$'


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	18 Feb 2009 07:13:02 -0000	1.56
+++ .cvsignore	25 Feb 2009 20:37:02 -0000	1.57
@@ -1 +1 @@
-xorg-server-1.5.99.903.tar.bz2
+xorg-server-1.6.0.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	5 Nov 2008 20:52:15 -0000	1.4
+++ import.log	25 Feb 2009 20:37:02 -0000	1.5
@@ -2,3 +2,4 @@
 xorg-x11-server-1_5_1-1_fc10:HEAD:xorg-x11-server-1.5.1-1.fc10.src.rpm:1222198557
 xorg-x11-server-1_5_2-1_fc10:HEAD:xorg-x11-server-1.5.2-1.fc10.src.rpm:1223667007
 xorg-x11-server-1_5_3-1_fc10:HEAD:xorg-x11-server-1.5.3-1.fc10.src.rpm:1225918317
+xorg-x11-server-1_6_0-1_fc11:HEAD:xorg-x11-server-1.6.0-1.fc11.src.rpm:1235594175


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	18 Feb 2009 07:13:02 -0000	1.51
+++ sources	25 Feb 2009 20:37:02 -0000	1.52
@@ -1 +1 @@
-c80db7b363ea9303243c58e77c464df0  xorg-server-1.5.99.903.tar.bz2
+aafe73f5807ce8bb534727ecb72467c7  xorg-server-1.6.0.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- xorg-x11-server.spec	18 Feb 2009 20:34:14 -0000	1.411
+++ xorg-x11-server.spec	25 Feb 2009 20:37:02 -0000	1.412
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.5.99.903
-Release:   3%{?dist}
+Version:   1.6.0
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -45,11 +45,11 @@
 
 # ABI version provides.
 # XXX don't enable any of this yet.  for serious.
-#Source30: find-provides
-#{expand:%%define prev__find_provides %{__find_provides}}
-#define pc_path %{buildroot}/%{_libdir}/pkgconfig/xorg-server.pc
+Source30: find-provides
+%{expand:%%define prev__find_provides %{__find_provides}}
+%define pc_path %{buildroot}/%{_libdir}/pkgconfig/xorg-server.pc
 #define __find_provides %{SOURCE30} %{pc_path} %{prev__find_provides}
-#define __find_provides %{nil}
+%define __find_provides %{nil}
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -82,9 +82,6 @@
 # cf. bug 482924
 Patch6010: xserver-1.5.99.902-selinux-debugging.patch
 
-# ensure HAL can start after X, upstream soon, not 1.6 yet.
-Patch6012: xserver-1.5.99.902-listen-for-hal.patch
-
 # don't try intel on poulsbo
 Patch6013: xserver-1.5.99.902-sod-off-poulsbo.patch
 
@@ -94,9 +91,6 @@
 # Make autoconfiguration chose nouveau driver for NVIDIA GPUs
 Patch6017: xserver-1.5.99.902-nouveau.patch
 
-Patch6018: xserver-1.5.99.903-glx-visual-score.patch
-Patch6019: xserver-1.5.99.903-fontmod.h
-
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -513,6 +507,9 @@
 
 
 %changelog
+* Wed Feb 25 2009 Adam Jackson <ajax at redhat.com> 1.6.0-1
+- xserver 1.6.0
+
 * Wed Feb 18 2009 Adam Jackson <ajax at redhat.com> 1.5.99.903-3
 - xserver-1.5.99.903-fontmod.h: Fix build against new libXfont.
 




--- commitid DELETED ---


--- make-git-snapshot.sh DELETED ---


--- xserver-1.4.99-builtin-fonts.patch DELETED ---


--- xserver-1.5.0-edid-backport.patch DELETED ---


--- xserver-1.5.0-exa-master-fix-x11perf-crash.patch DELETED ---


--- xserver-1.5.0-force-SwitchCoreKeyboard-for-evdev.patch DELETED ---


--- xserver-1.5.0-hide-cursor.patch DELETED ---


--- xserver-1.5.1-exa-fix-glyph-segfault.patch DELETED ---


--- xserver-1.5.1-xgi.patch DELETED ---


--- xserver-1.5.2-exa-master-upgrade.patch DELETED ---


--- xserver-1.5.2-more-sanity-checks.patch DELETED ---


--- xserver-1.5.99.3-ddx-rules.patch DELETED ---


--- xserver-1.5.99.3-offscreen-pixmaps.patch DELETED ---


--- xserver-1.5.99.902-listen-for-hal.patch DELETED ---


--- xserver-1.5.99.903-fontmod.h DELETED ---


--- xserver-1.5.99.903-glx-visual-score.patch DELETED ---


