Today's server from git

This commit is contained in:
Peter Hutterer 2011-04-18 16:06:08 +10:00
parent 6debda7ca9
commit de81d9548c
4 changed files with 9 additions and 6 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ xorg-server-1.9.1.tar.bz2
/xorg-server-20101125.tar.xz /xorg-server-20101125.tar.xz
/xorg-server-20101201.tar.xz /xorg-server-20101201.tar.xz
/xorg-server-1.10.0.tar.bz2 /xorg-server-1.10.0.tar.bz2
/xorg-server-20110418.tar.xz

View File

@ -1 +1 @@
02449ee24b484c9fea501df5274d95a9f87cab23 b3d2164a0361f636bfe77b51456bee9213af4f13

View File

@ -1 +1 @@
57c143c5cfa507680933b6c4904f829c xorg-server-1.10.0.tar.bz2 1ae649350f2084fdd348589e68b44e55 xorg-server-20110418.tar.xz

View File

@ -25,12 +25,12 @@
%define extension_minor 0 %define extension_minor 0
%define pkgname xorg-server %define pkgname xorg-server
#define gitdate 20110225 %define gitdate 20110418
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.10.0 Version: 1.10.99.1
Release: 7%{?gitdate:.%{gitdate}}%{dist} Release: 1%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -397,7 +397,6 @@ cp {,%{inst_srcdir}/}doc/xml/xserver.ent.in
cp {,%{inst_srcdir}/}doc/xml/Xserver-spec.xml cp {,%{inst_srcdir}/}doc/xml/Xserver-spec.xml
cp {,%{inst_srcdir}/}doc/xml/dtrace/Xserver-DTrace.xml cp {,%{inst_srcdir}/}doc/xml/dtrace/Xserver-DTrace.xml
cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in cp {,%{inst_srcdir}/}hw/xquartz/bundle/cpprules.in
cp {,%{inst_srcdir}/}hw/dmx/doc/doxygen.conf.in
cp {,%{inst_srcdir}/}doc/man/Xserver.man cp {,%{inst_srcdir}/}doc/man/Xserver.man
cp {,%{inst_srcdir}/}doc/smartsched cp {,%{inst_srcdir}/}doc/smartsched
cp xkb/README.compiled %{inst_srcdir}/xkb cp xkb/README.compiled %{inst_srcdir}/xkb
@ -554,6 +553,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir} %{xserver_source_dir}
%changelog %changelog
* Mon Apr 18 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.10.99.1-1.20110418
- Today's server from git
* Wed Mar 30 2011 Adam Jackson <ajax@redhat.com> 1.10.0-7 * Wed Mar 30 2011 Adam Jackson <ajax@redhat.com> 1.10.0-7
- xserver-1.10-glx-pixmap-crash.patch, xserver-1.10-bg-none-revert.patch: - xserver-1.10-glx-pixmap-crash.patch, xserver-1.10-bg-none-revert.patch:
bugfixes from xserver-next bugfixes from xserver-next