rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix installation of xserver-sdk-abi-requires script, if stable_abi is set

Browse Source 
always install the relese one, not the git one
This commit is contained in:
Peter Hutterer 2012-02-12 00:13:15 +10:00
parent 40fc0b7d46
commit 70b4c71081
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xorg-x11-server.spec
View File

@ -48,7 +48,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.11.99.901 Version: 1.11.99.901
Release: 5%{?gitdate:.%{gitdate}}%{dist} Release: 6%{?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
@ -398,12 +398,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_bindir}
%if 0%{?gitdate} %if !0%{?gitdate} || %{stable_abi}
install -m 755 %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires
%else
sed -e s/@MAJOR@/%{gitdate}/g -e s/@MINOR@/%{minor_serial}/g %{SOURCE31} > \ sed -e s/@MAJOR@/%{gitdate}/g -e s/@MINOR@/%{minor_serial}/g %{SOURCE31} > \
$RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires
chmod 755 $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires chmod 755 $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires
%else
install -m 755 %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/xserver-sdk-abi-requires
%endif %endif
%endif %endif
@ -560,6 +560,10 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir} %{xserver_source_dir}
%changelog %changelog
* 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
* Sat Feb 11 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.901-5.20120124 * Sat Feb 11 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.99.901-5.20120124
- ABI is considered stable now: - ABI is considered stable now:
video 12.0, input 16.0, extension 6.0, font 0.6, ansic 0.4 video 12.0, input 16.0, extension 6.0, font 0.6, ansic 0.4