rpms/multilib-rpm-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix FTBFS on plain RHEL 6

Browse Source 
%license definition needs to be done after License tag.

Version: 1-8
This commit is contained in:
Pavel Raiskup 2017-04-07 13:52:09 +02:00
parent 7edeb07788
commit 23edc2081f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
multilib-rpm-config.spec
View File

@ -1,8 +1,3 @@
# While we are in package playing with packaging principles, why about having
# this solved in redhat-rpm-config too? (Also for RHELs which are alive, or
# EPELs otherwise).
%{!?_licensedir:%global license %doc}
# https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_of_Additional_RPM_Macros # https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_of_Additional_RPM_Macros
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
@ -11,8 +6,14 @@
Summary: Multilib packaging helpers Summary: Multilib packaging helpers
Name: multilib-rpm-config Name: multilib-rpm-config
Version: 1 Version: 1
Release: 7%{?dist} Release: 8%{?dist}
License: GPLv2+ License: GPLv2+
# TODO: resolve directly in rpm/redhat-rpm-config (instead of this hack).
# Note that to avoid FTBFS against plain RHEL6, we can't put this hack before
# License tag.
%{!?_licensedir:%global license %%doc}
URL: https://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks URL: https://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks
BuildRequires: gcc BuildRequires: gcc
@ -118,6 +119,9 @@ test `$capable --arch ppc64p7` = true
%changelog %changelog
* Fri Apr 07 2017 Pavel Raiskup <praiskup@redhat.com> - 1-8
- fix FTBFS on plain RHEL6
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1-7 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild