rpms/xorg-x11-server/F-9 .cvsignore, 1.47, 1.48 commitid, 1.19, 1.20 sources, 1.41, 1.42 xorg-x11-server.spec, 1.337, 1.338 xorg-x11-server-Red-Hat-extramodes.patch, 1.8, NONE xserver-1.4.99-selinux-awareness.patch, 1.3, NONE xserver-1.4.99-xaa-evict-pixmaps.patch, 1.2, NONE xserver-1.5.0-fix-single-aspect.patch, 1.1, NONE xserver-1.5.0-xaa-sucks.patch, 1.2, NONE
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Tue Jul 1 15:10:02 UTC 2008
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-server/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13705/F-9
Modified Files:
.cvsignore commitid sources xorg-x11-server.spec
Removed Files:
xorg-x11-server-Red-Hat-extramodes.patch
xserver-1.4.99-selinux-awareness.patch
xserver-1.4.99-xaa-evict-pixmaps.patch
xserver-1.5.0-fix-single-aspect.patch
xserver-1.5.0-xaa-sucks.patch
Log Message:
xserver 1.5RC5.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore 12 Jun 2008 02:07:31 -0000 1.47
+++ .cvsignore 1 Jul 2008 15:09:08 -0000 1.48
@@ -1 +1 @@
-xorg-server-20080612.tar.bz2
+xorg-server-20080701.tar.bz2
Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/commitid,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- commitid 12 Jun 2008 02:07:31 -0000 1.19
+++ commitid 1 Jul 2008 15:09:08 -0000 1.20
@@ -1 +1 @@
-53a84d75c65f75c629c6610a2ec4093507cea3f7
+ccb373f2fb910db57a3dfcef8a03779f1023470c
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources 12 Jun 2008 02:07:31 -0000 1.41
+++ sources 1 Jul 2008 15:09:08 -0000 1.42
@@ -1 +1 @@
-067f2f0fdbcac0f8a7cd4f4ee046a2c8 xorg-server-20080612.tar.bz2
+a0e25d1c6ed0ed945e4a84b6b288f6fe xorg-server-20080701.tar.bz2
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- xorg-x11-server.spec 12 Jun 2008 04:58:20 -0000 1.337
+++ xorg-x11-server.spec 1 Jul 2008 15:09:08 -0000 1.338
@@ -15,12 +15,12 @@
# RHEL5 bugfix sync
%define pkgname xorg-server
-%define gitdate 20080612
+%define gitdate 20080701
Summary: X.Org X11 X server
Name: xorg-x11-server
-Version: 1.4.99.902
-Release: 3.%{gitdate}%{?dist}
+Version: 1.4.99.905
+Release: 1.%{gitdate}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -42,12 +42,15 @@
# Red Hat specific tweaking, not intended for upstream
# XXX move these to the end of the list
-Patch1001: xorg-x11-server-Red-Hat-extramodes.patch
+# dropme
+#Patch1001: xorg-x11-server-Red-Hat-extramodes.patch
Patch1003: xserver-1.4.99-pic-libxf86config.patch
-Patch1004: xserver-1.4.99-selinux-awareness.patch
+# maybe?
+#Patch1004: xserver-1.4.99-selinux-awareness.patch
Patch1005: xserver-1.4.99-builtin-fonts.patch
Patch1010: xserver-1.3.0-no-prerelease-warning.patch
-Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch
+# rebase for GL/glx -> glx move
+#Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch
Patch2013: xserver-1.4.99-document-fontpath-correctly.patch
@@ -58,9 +61,9 @@
Patch5002: xserver-1.4.99-ssh-isnt-local.patch
Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch
-Patch5008: xserver-1.5.0-xaa-sucks.patch
+#Patch5008: xserver-1.5.0-xaa-sucks.patch
Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch
-Patch5010: xserver-1.5.0-fix-single-aspect.patch
+#Patch5010: xserver-1.5.0-fix-single-aspect.patch
%define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri
@@ -111,8 +114,9 @@
# openssl? really?
BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex
-BuildRequires: mesa-libGL-devel >= 7.1-0.21
-BuildRequires: mesa-source >= 7.1-0.21
+BuildRequires: mesa-libGL-devel >= 7.1-0.36
+# should be useless now...
+# BuildRequires: mesa-source >= 7.1-0.36
# XXX silly...
BuildRequires: libdrm-devel >= 2.4.0
%if %{with_hw_servers}
@@ -310,7 +314,6 @@
--disable-xorgcfg \
--disable-record \
--enable-install-libxf86config \
- --with-mesa-source=%{_datadir}/mesa/source \
--enable-xselinux \
--with-dri-driver-path=%{drimoduledir} \
${CONFIGURE}
@@ -336,7 +339,6 @@
mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/xfree86/{common,utils/xorgconfig}}
cp cpprules.in %{inst_srcdir}
cp xkb/README.compiled %{inst_srcdir}/xkb
-cp GL/symlink-mesa.sh %{inst_srcdir}/GL
cp hw/xfree86/{xorgconf.cpp,Options} %{inst_srcdir}/hw/xfree86
cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common
cp hw/xfree86/utils/xorgconfig/Cards{,98} %{inst_srcdir}/hw/xfree86/utils/xorgconfig/
@@ -418,7 +420,6 @@
%dir %{_libdir}/xorg/modules
%dir %{_libdir}/xorg/modules/drivers
%dir %{_libdir}/xorg/modules/extensions
-%{_libdir}/xorg/modules/extensions/libGLcore.so
%{_libdir}/xorg/modules/extensions/libglx.so
%{_libdir}/xorg/modules/extensions/libdri.so
%{_libdir}/xorg/modules/extensions/libdri2.so
@@ -511,6 +512,9 @@
%changelog
+* Mon Jun 30 2008 Adam Jackson <ajax at redhat.com> 1.4.99.905-1.20080701
+- 1.5RC5.
+
* Thu Jun 12 2008 Dave Airlie <airlied at redhat.com> 1.4.99.902-3.20080612
- xserver-1.5.0-fix-single-aspect.patch - fix 2560x1600 on my monitor.
--- xorg-x11-server-Red-Hat-extramodes.patch DELETED ---
--- xserver-1.4.99-selinux-awareness.patch DELETED ---
--- xserver-1.4.99-xaa-evict-pixmaps.patch DELETED ---
--- xserver-1.5.0-fix-single-aspect.patch DELETED ---
--- xserver-1.5.0-xaa-sucks.patch DELETED ---
More information about the fedora-extras-commits
mailing list