Today's git snapshot
This commit is contained in:
parent
70b4c71081
commit
ed473e11ff
1
.gitignore
vendored
1
.gitignore
vendored
@ -10,3 +10,4 @@ xorg-server-1.9.1.tar.bz2
|
||||
/xorg-server-20111109.tar.xz
|
||||
/xorg-server-20120103.tar.xz
|
||||
/xorg-server-20120124.tar.xz
|
||||
/xorg-server-20120215.tar.xz
|
||||
|
2
commitid
2
commitid
@ -1 +1 @@
|
||||
954bb994842aa43a0f272858e65036c016b729a4
|
||||
d53235af85d50774c68347720ce132daf9a5bc49
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
6f5d63d685404c4232b7e60f70bcf579 xorg-server-20120124.tar.xz
|
||||
4c1392aeef04d011b4a79f010c157dab xorg-server-20120215.tar.xz
|
||||
|
@ -9,7 +9,7 @@
|
||||
# check out the master branch, pull, cherry-pick, and push. FIXME describe
|
||||
# rebasing, add convenience 'make' targets maybe.
|
||||
|
||||
%define gitdate 20120124
|
||||
%define gitdate 20120215
|
||||
%define stable_abi 1
|
||||
|
||||
%if !0%{?gitdate} || %{stable_abi}
|
||||
@ -48,7 +48,7 @@
|
||||
Summary: X.Org X11 X server
|
||||
Name: xorg-x11-server
|
||||
Version: 1.11.99.901
|
||||
Release: 6%{?gitdate:.%{gitdate}}%{dist}
|
||||
Release: 7%{?gitdate:.%{gitdate}}%{dist}
|
||||
URL: http://www.x.org
|
||||
License: MIT
|
||||
Group: User Interface/X
|
||||
@ -129,7 +129,7 @@ BuildRequires: git-core
|
||||
BuildRequires: automake autoconf libtool pkgconfig
|
||||
BuildRequires: xorg-x11-util-macros >= 1.1.5
|
||||
|
||||
BuildRequires: xorg-x11-proto-devel >= 7.4-35
|
||||
BuildRequires: xorg-x11-proto-devel >= 7.6-20
|
||||
BuildRequires: xorg-x11-font-utils >= 7.2-11
|
||||
|
||||
BuildRequires: xorg-x11-xtrans-devel >= 1.2.2-1
|
||||
@ -560,6 +560,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{xserver_source_dir}
|
||||
|
||||
%changelog
|
||||
* Wed Feb 15 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.901-7.20120215
|
||||
- Today's git snapshot
|
||||
|
||||
* Sun Feb 12 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.901-6.20120124
|
||||
- Fix installation of xserver-sdk-abi-requires script, if stable_abi is set
|
||||
always install the relese one, not the git one
|
||||
|
Loading…
Reference in New Issue
Block a user