Fri Nov 2 17:11:47 UTC 2007

Author: ajax

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

Modified Files:
	xorg-x11-server.spec 
Removed Files:
	xorg-x11-server-0.99.3-init-origins-fix.patch 
	xorg-x11-server-1.0.1-fpic-libxf86config.patch 
	xorg-x11-server-1.1.0-dont-backfill-bg-none.patch 
	xorg-x11-server-1.1.1-automake-1.10-fixes.patch 
	xorg-x11-server-1.1.1-builderstring.patch 
	xorg-x11-server-1.1.1-builtin-fonts.patch 
	xorg-x11-server-1.1.1-graphics-expose.patch 
	xorg-x11-server-1.1.1-no-composite-in-xnest.patch 
	xorg-x11-server-1.1.1-no-scanpci.patch 
	xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch 
	xorg-x11-server-1.1.1-vbe-filter-less.patch 
	xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch 
	xorg-x11-server-1.1.1-xkb-in-xnest.patch 
	xorg-x11-server-1.2.0-enable-composite.patch 
	xorg-x11-server-1.2.0-selinux-awareness.patch 
	xorg-x11-server-1.2.0-xephyr-only.patch 
	xorg-x11-server-1.2.0-xf86config-comment-less.patch 
	xorg-x11-server-libxf86config-dont-write-empty-sections.patch 
	xserver-1.2.0-geode-mmx.patch xserver-1.2.0-vfprintf.patch 
	xserver-1.2.0-xephyr-keysym-madness.patch 
	xserver-1.3.0-accidental-abi.patch 
	xserver-1.3.0-add-really-slow-bcopy.patch 
	xserver-1.3.0-arm-iopl.patch 
	xserver-1.3.0-avoid-ps2-probe.patch 
	xserver-1.3.0-composite-version.patch 
	xserver-1.3.0-exaupgrade.patch 
	xserver-1.3.0-fbdevhw-magic-numbers.patch 
	xserver-1.3.0-idletime.patch 
	xserver-1.3.0-intel-by-default.patch 
	xserver-1.3.0-late-sigusr1.patch xserver-1.3.0-mesa7.patch 
	xserver-1.3.0-newglx-offscreen-pixmaps.patch 
	xserver-1.3.0-no-pseudocolor-composite.patch 
	xserver-1.3.0-ramdac-export.patch 
	xserver-1.3.0-randr-preferred-mode-fix.patch 
	xserver-1.3.0-randr-updates.patch 
	xserver-1.3.0-randrama-no-zero-screens.patch 
	xserver-1.3.0-reput-video.patch 
	xserver-1.3.0-update-quirks.patch 
	xserver-1.3.0-x86emu-imul-int64.patch 
	xserver-1.3.0-xkb-and-loathing.patch 
	xserver-1.3.0-xorg-conf-man-randr-update.patch 
	xserver-1.3.0-xrandr-timestamp-buglet.patch 
Log Message:
* Fri Nov 02 2007 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.6
- Merge a bunch of the more trivial patches upstream.
- New git snapshot containing the merged bits.
- Remove unused patches.
- Drop the XFree86 obsoletes.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264

--- xorg-x11-server.spec	2 Nov 2007 15:31:55 -0000	1.263
+++ xorg-x11-server.spec	2 Nov 2007 17:11:11 -0000	1.264
@@ -15,12 +15,12 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20071101
+%define gitdate 20071102
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.1
-Release:   0.5%{?dist}
+Release:   0.6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -38,10 +38,7 @@
 Source100: comment-header-modefiles.txt
 
 # general bug fixes
-Patch0:    xorg-x11-server-0.99.3-init-origins-fix.patch
-Patch10:   xorg-x11-server-1.1.1-vbe-filter-less.patch
 Patch19:   xserver-1.3.0-xnest-exposures.patch
-Patch22:   xserver-1.3.0-fbdevhw-magic-numbers.patch
 
 # OpenGL compositing manager feature/optimization patches.
 Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
@@ -53,25 +50,13 @@
 Patch1003:  xserver-1.4.99-pic-libxf86config.patch
 Patch1004:  xserver-1.4.99-selinux-awareness.patch
 Patch1005:  xserver-1.4.99-builtin-fonts.patch
-Patch1008:  xorg-x11-server-1.2.0-xf86config-comment-less.patch
 Patch1010:  xserver-1.3.0-no-prerelease-warning.patch
 Patch1014:  xserver-1.4.99-xaa-evict-pixmaps.patch
 Patch1022:  xserver-1.3.0-default-dpi.patch
-Patch1024:  xserver-1.3.0-avoid-ps2-probe.patch
 
 Patch2004:  xserver-1.3.0-honor-displaysize.patch
 Patch2007:  xserver-1.3.0-randr12-config-hack.patch
 Patch2013:  xserver-1.3.0-document-fontpath-correctly.patch
-Patch2015:  xserver-1.3.0-accidental-abi.patch
-Patch2016:  xserver-1.4.99-late-sigusr1.patch
-
-# assorted PCI layer shenanigans.  oh the pain.
-##Patch2500:  xorg-x11-server-1.2.99-unbreak-domain.patch
-##Patch2501:  xserver-1.3.0-pci-bus-count.patch
-##Patch2502:  xserver-1.3.0-mmap-failure-check.patch
-##Patch2503:  xserver-1.3.0-rom-search.patch
-##Patch2504:  xserver-1.3.0-domain-obiwan.patch
-##Patch2505:  xserver-1.3.0-pci-device-enable.patch
 
 
 %define moduledir	%{_libdir}/xorg/modules
@@ -91,7 +76,7 @@
 %endif
 
 %define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-kdrive-vesa
-%define xservers --enable-xvfb --enable-xnest %{kdrive} --enable-dmx
+%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg} --enable-dmx
 
 # FIXME: Temporary Build deps on autotools, as needed...
 BuildRequires: automake autoconf libtool
@@ -180,7 +165,7 @@
 %package Xnest
 Summary: A nested server.
 Group: User Interface/X
-Obsoletes: XFree86-Xnest, xorg-x11-Xnest
+Obsoletes: xorg-x11-Xnest
 Requires: xorg-x11-server-common >= %{version}-%{release}
 Provides: Xnest
 
@@ -213,7 +198,7 @@
 %package Xvfb
 Summary: A X Windows System virtual framebuffer X server.
 Group: User Interface/X
-Obsoletes: XFree86-Xvfb xorg-x11-Xvfb
+Obsoletes: xorg-x11-Xvfb
 Requires: xorg-x11-server-common >= %{version}-%{release}
 Provides: Xvfb
 
@@ -246,7 +231,7 @@
 %package devel
 Summary: SDK for X server driver module development
 Group: User Interface/X
-Obsoletes: XFree86-sdk xorg-x11-sdk xorg-x11-server-sdk
+Obsoletes: xorg-x11-sdk xorg-x11-server-sdk
 Requires: xorg-x11-util-macros
 Requires: xorg-x11-proto-devel
 Requires: pkgconfig
@@ -300,8 +285,7 @@
 # --with-rgb-path should be superfluous now ?
 # --with-pie ?
 autoreconf -v --install || exit 1
-%configure --enable-maintainer-mode \
-	%{enable_xorg} %{xservers} \
+%configure --enable-maintainer-mode %{xservers} \
 	--disable-static \
 	--with-pic \
 	--disable-{a,c,m}fb \
@@ -534,6 +518,12 @@
 
 
 %changelog
+* Fri Nov 02 2007 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.6
+- Merge a bunch of the more trivial patches upstream.
+- New git snapshot containing the merged bits.
+- Remove unused patches.
+- Drop the XFree86 obsoletes.
+
 * Fri Nov 02 2007 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.5
 - New git snapshot that fixes Xdmx build.
 - Reenable Xdmx build.


--- xorg-x11-server-0.99.3-init-origins-fix.patch DELETED ---


--- xorg-x11-server-1.0.1-fpic-libxf86config.patch DELETED ---


--- xorg-x11-server-1.1.0-dont-backfill-bg-none.patch DELETED ---


--- xorg-x11-server-1.1.1-automake-1.10-fixes.patch DELETED ---


--- xorg-x11-server-1.1.1-builderstring.patch DELETED ---


--- xorg-x11-server-1.1.1-builtin-fonts.patch DELETED ---


--- xorg-x11-server-1.1.1-graphics-expose.patch DELETED ---


--- xorg-x11-server-1.1.1-no-composite-in-xnest.patch DELETED ---


--- xorg-x11-server-1.1.1-no-scanpci.patch DELETED ---


--- xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch DELETED ---


--- xorg-x11-server-1.1.1-vbe-filter-less.patch DELETED ---


--- xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch DELETED ---


--- xorg-x11-server-1.1.1-xkb-in-xnest.patch DELETED ---


--- xorg-x11-server-1.2.0-enable-composite.patch DELETED ---


--- xorg-x11-server-1.2.0-selinux-awareness.patch DELETED ---


--- xorg-x11-server-1.2.0-xephyr-only.patch DELETED ---


--- xorg-x11-server-1.2.0-xf86config-comment-less.patch DELETED ---


--- xorg-x11-server-libxf86config-dont-write-empty-sections.patch DELETED ---


--- xserver-1.2.0-geode-mmx.patch DELETED ---


--- xserver-1.2.0-vfprintf.patch DELETED ---


--- xserver-1.2.0-xephyr-keysym-madness.patch DELETED ---


--- xserver-1.3.0-accidental-abi.patch DELETED ---


--- xserver-1.3.0-add-really-slow-bcopy.patch DELETED ---


--- xserver-1.3.0-arm-iopl.patch DELETED ---


--- xserver-1.3.0-avoid-ps2-probe.patch DELETED ---


--- xserver-1.3.0-composite-version.patch DELETED ---


--- xserver-1.3.0-exaupgrade.patch DELETED ---


--- xserver-1.3.0-fbdevhw-magic-numbers.patch DELETED ---


--- xserver-1.3.0-idletime.patch DELETED ---


--- xserver-1.3.0-intel-by-default.patch DELETED ---


--- xserver-1.3.0-late-sigusr1.patch DELETED ---


--- xserver-1.3.0-mesa7.patch DELETED ---


--- xserver-1.3.0-newglx-offscreen-pixmaps.patch DELETED ---


--- xserver-1.3.0-no-pseudocolor-composite.patch DELETED ---


--- xserver-1.3.0-ramdac-export.patch DELETED ---


--- xserver-1.3.0-randr-preferred-mode-fix.patch DELETED ---


--- xserver-1.3.0-randr-updates.patch DELETED ---


--- xserver-1.3.0-randrama-no-zero-screens.patch DELETED ---


--- xserver-1.3.0-reput-video.patch DELETED ---


--- xserver-1.3.0-update-quirks.patch DELETED ---


--- xserver-1.3.0-x86emu-imul-int64.patch DELETED ---


--- xserver-1.3.0-xkb-and-loathing.patch DELETED ---


--- xserver-1.3.0-xorg-conf-man-randr-update.patch DELETED ---


--- xserver-1.3.0-xrandr-timestamp-buglet.patch DELETED ---


