rpms/xorg-x11-server/devel .cvsignore, 1.61, 1.62 commitid, 1.24, 1.25 sources, 1.56, 1.57 xorg-x11-server.spec, 1.445, 1.446
Adam Jackson
ajax at fedoraproject.org
Tue Jul 14 18:51:22 UTC 2009
- Previous message (by thread): rpms/evolution/devel .cvsignore, 1.116.2.7, 1.116.2.8 sources, 1.116.2.11, 1.116.2.12
- Next message (by thread): rpms/lxsession-lite/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE import.log, 1.1, NONE lxsession-lite-0.3.6-icon_search_path_fix-1.patch, 1.1, NONE lxsession-lite-0.3.6-new-gdm.patch, 1.1, NONE lxsession-lite-0.3.6-session_name_fix.patch, 1.1, NONE lxsession-lite.spec, 1.5, NONE sources, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19291
Modified Files:
.cvsignore commitid sources xorg-x11-server.spec
Log Message:
* Tue Jul 14 2009 Adam Jackson <ajax at redhat.com> 1.6.99-12.20090714
- Today's git snapshot.
- Drop the %pre script for Xorg, everyone ought to be migrated by now.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore 7 Jul 2009 20:21:37 -0000 1.61
+++ .cvsignore 14 Jul 2009 18:50:51 -0000 1.62
@@ -1,2 +1 @@
-xorg-server-20090706.tar.bz2
-xorg-server-20090707.tar.bz2
+xorg-server-20090714.tar.bz2
Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- commitid 10 Jul 2009 04:41:40 -0000 1.24
+++ commitid 14 Jul 2009 18:50:51 -0000 1.25
@@ -1 +1 @@
-3711d68f657c77b947cc4670cc4eac4f62de3af8
+686e4867302a741f3029c4105b997d0f0ac7c13c
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources 7 Jul 2009 20:21:37 -0000 1.56
+++ sources 14 Jul 2009 18:50:51 -0000 1.57
@@ -1 +1 @@
-c635400ae9b5a4ffb1fa1a6cb4377952 xorg-server-20090707.tar.bz2
+1be9eeb4f40a1d8c90f146a3ddff246f xorg-server-20090714.tar.bz2
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -p -r1.445 -r1.446
--- xorg-x11-server.spec 10 Jul 2009 04:41:40 -0000 1.445
+++ xorg-x11-server.spec 14 Jul 2009 18:50:51 -0000 1.446
@@ -14,12 +14,12 @@
# Fix rhpxl to no longer need vesamodes/extramodes
%define pkgname xorg-server
-%define gitdate 20090710
+%define gitdate 20090714
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.6.99
-Release: 11.%{gitdate}%{?dist}
+Release: 12.%{gitdate}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -90,8 +90,8 @@ Patch6042: xserver-1.6.1-proc-cmdline.pa
%endif
%define kdrive --enable-kdrive --enable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev
+# XXX dmx
%define xservers --enable-xvfb --enable-xnest %{kdrive} %{enable_xorg}
-# FIXME: dmx is broken, no --enable-dmx for you
BuildRequires: git-core
BuildRequires: automake autoconf libtool pkgconfig
@@ -196,7 +196,7 @@ but it is an X server itself in which yo
is a very useful tool for developers who wish to test their
applications without running them on their real X server.
-
+%if 0
%package Xdmx
Summary: Distributed Multihead X Server and utilities
Group: User Interface/X
@@ -213,7 +213,7 @@ for Xdmx would be to provide multi-head
each of which has a single display device attached to it. A complex
application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays
(each attached to one of 16 computers) into a unified 5120x4096 display.
-
+%endif
%package Xvfb
Summary: A X Windows System virtual framebuffer X server.
@@ -394,21 +394,6 @@ xargs tar cf - | (cd %{inst_srcdir} && t
%clean
rm -rf $RPM_BUILD_ROOT
-%if %{with_hw_servers}
-%pre Xorg
-{
- pushd /etc/X11
-
- [ -e xorg.conf ] || return 0
-
- sed -i 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' xorg.conf
- sed -i 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' xorg.conf
- sed -i 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' xorg.conf
- sed -i 's#^\s*RgbPath.*$##gi' xorg.conf
-
- popd
-} &> /dev/null || :
-%endif
%files common
%defattr(-,root,root,-)
@@ -473,26 +458,26 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/Xnest
%{_mandir}/man1/Xnest.1*
-
-#%files Xdmx
-#%defattr(-,root,root,-)
-#%{_bindir}/Xdmx
-#%{_bindir}/dmxaddinput
-#%{_bindir}/dmxaddscreen
-#%{_bindir}/dmxreconfig
-#%{_bindir}/dmxresize
-#%{_bindir}/dmxrminput
-#%{_bindir}/dmxrmscreen
-#%{_bindir}/dmxtodmx
-#%{_bindir}/dmxwininfo
-#%{_bindir}/vdltodmx
-#%{_bindir}/xdmx
-#%{_bindir}/xdmxconfig
-#%{_mandir}/man1/Xdmx.1*
-#%{_mandir}/man1/dmxtodmx.1*
-#%{_mandir}/man1/vdltodmx.1*
-#%{_mandir}/man1/xdmxconfig.1*
-
+%if 0
+%files Xdmx
+%defattr(-,root,root,-)
+%{_bindir}/Xdmx
+%{_bindir}/dmxaddinput
+%{_bindir}/dmxaddscreen
+%{_bindir}/dmxreconfig
+%{_bindir}/dmxresize
+%{_bindir}/dmxrminput
+%{_bindir}/dmxrmscreen
+%{_bindir}/dmxtodmx
+%{_bindir}/dmxwininfo
+%{_bindir}/vdltodmx
+%{_bindir}/xdmx
+%{_bindir}/xdmxconfig
+%{_mandir}/man1/Xdmx.1*
+%{_mandir}/man1/dmxtodmx.1*
+%{_mandir}/man1/vdltodmx.1*
+%{_mandir}/man1/xdmxconfig.1*
+%endif
%files Xvfb
%defattr(-,root,root,-)
@@ -524,8 +509,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n libxf86config
%defattr(-, root, root, -)
-%{_libdir}/libxf86config.so.0
-%{_libdir}/libxf86config.so.0.0.0
+%{_libdir}/libxf86config.so.0*
%files -n libxf86config-devel
@@ -534,6 +518,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jul 14 2009 Adam Jackson <ajax at redhat.com> 1.6.99-12.20090714
+- Today's git snapshot.
+- Drop the %%pre script for Xorg, everyone ought to be migrated by now.
+
* Fri Jul 10 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-11.20090710
- Today's git snapshot.
- xserver-1.6.0-no-i810.patch: Drop.
- Previous message (by thread): rpms/evolution/devel .cvsignore, 1.116.2.7, 1.116.2.8 sources, 1.116.2.11, 1.116.2.12
- Next message (by thread): rpms/lxsession-lite/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE import.log, 1.1, NONE lxsession-lite-0.3.6-icon_search_path_fix-1.patch, 1.1, NONE lxsession-lite-0.3.6-new-gdm.patch, 1.1, NONE lxsession-lite-0.3.6-session_name_fix.patch, 1.1, NONE lxsession-lite.spec, 1.5, NONE sources, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list