rpms/xorg-x11-server/devel .cvsignore, 1.27, 1.28 sources, 1.22, 1.23 xorg-x11-server.spec, 1.264, 1.265

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	31 Oct 2007 19:28:56 -0000	1.27
+++ .cvsignore	12 Nov 2007 20:39:39 -0000	1.28
@@ -1 +1 @@
-xorg-server-20071031.tar.bz2
+xorg-server-20071102.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	31 Oct 2007 19:28:56 -0000	1.22
+++ sources	12 Nov 2007 20:39:39 -0000	1.23
@@ -1 +1 @@
-730466f1d01714e40a1153cda0c15d25  xorg-server-20071031.tar.bz2
+c2ebed7ea33f8795883c19b18397c2c7  xorg-server-20071102.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- xorg-x11-server.spec	2 Nov 2007 17:11:11 -0000	1.264
+++ xorg-x11-server.spec	12 Nov 2007 20:39:39 -0000	1.265
@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.1
-Release:   0.6%{?dist}
+Release:   0.7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -58,6 +58,11 @@
 Patch2007:  xserver-1.3.0-randr12-config-hack.patch
 Patch2013:  xserver-1.3.0-document-fontpath-correctly.patch
 
+# Trivial things to merge upstream at next rebase
+Patch4000: ddc-faster-plz.patch
+Patch4001: no-sleep-at-exit.patch
+Patch4002: pogo-stick.patch
+
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -78,10 +83,8 @@
 %define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-kdrive-vesa
 %define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg} --enable-dmx
 
-# FIXME: Temporary Build deps on autotools, as needed...
-BuildRequires: automake autoconf libtool
-
-BuildRequires: git pkgconfig
+BuildRequires: git
+BuildRequires: automake autoconf libtool pkgconfig
 BuildRequires: xorg-x11-util-macros >= 1.1.5
 
 BuildRequires: xorg-x11-proto-devel >= 7.1-11
@@ -265,22 +268,12 @@
 git-init-db
 %endif
 
-# Apply all the patches.
+# Apply all the patches.  Hold your nose...
 git-am -p1 $(awk '/^Patch.*:/ { print "../"$2 }' ../%{name}.spec)
 
 %build
 
-if [ -z "${SRSLY}" ]; then
-    # This is a work in progress.  You probably do not want to build
-    # it locally.  You definitely should not build it into Koji.
-    false
-fi
-
-%if %{fedora} == 7
-%define default_font_path "unix/:7100,catalogue:/etc/X11/fontpath.d,built-ins"
-%else
 %define default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
-%endif
 
 # --with-rgb-path should be superfluous now ?
 # --with-pie ?
@@ -298,10 +291,8 @@
 	--disable-xorgcfg \
 	--enable-install-libxf86config \
 	--with-mesa-source=%{_datadir}/mesa/source \
-%if %{with_hw_servers}
 	--enable-dri \
 	--with-dri-driver-path=%{drimoduledir} \
-%endif
 	${CONFIGURE}
 
 make -s %{?_smp_mflags}
@@ -411,7 +402,6 @@
 %{_localstatedir}/lib/xkb/README.compiled
 
 
-# XXX xf8_16bpp disappears with --disable-cfb, for no reason.
 %if %{with_hw_servers}
 %files Xorg
 %defattr(-,root,root,-)