rebase to 1.12.99.903 snapshot

This commit is contained in:
Dave Airlie 2012-07-26 13:16:02 +10:00
parent 2cc88165d0
commit 68143df18c
4 changed files with 9 additions and 5 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@ xorg-server-1.9.1.tar.bz2
/xorg-server-1.12.2.tar.bz2
/xorg-server-1.12.3.tar.bz2
/xorg-server-20120717.tar.xz
/xorg-server-20120726.tar.xz

View File

@ -1 +1 @@
77de2994774e7be24a0bad521180628feb1027c6
afa53fe7cffd430cf11f25ca818cb955a78c0c1c

View File

@ -1 +1 @@
961bb1ecade0ade9a4f0c04be063142c xorg-server-20120717.tar.xz
cf47efdea83833e3348f1f7adcd19d57 xorg-server-20120726.tar.xz

View File

@ -9,7 +9,7 @@
# check out the master branch, pull, cherry-pick, and push. FIXME describe
# rebasing, add convenience 'make' targets maybe.
%define gitdate 20120717
%define gitdate 20120726
%define stable_abi 1
%if !0%{?gitdate} || %{stable_abi}
@ -47,8 +47,8 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.12.99.902
Release: 3%{?gitdate:.%{gitdate}}%{dist}
Version: 1.12.99.903
Release: 1%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@ -573,6 +573,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
* Thu Jul 26 2012 Dave Airlie <airlied@redhat.com> 1.12.99.903-1
- rebase to 1.12.99.903 snapshot
* Wed Jul 25 2012 Dave Airlie <airlied@redhat.com> 1.12.99.902-3
- fix crash due to GLX being linked twice