openstack
/
rpm-packaging
Code Issues Proposed changes

Fix Fedora macros in RHEL > 7 

[1] included the Fedora macros for RHEL 8 and newer, however it failed
to copy it during the %install phase.

[1] - https://review.openstack.org/633526

Change-Id: I25e82cb1c36ea3803235412d154dfa78af385cb9
This commit is contained in:
Javier Pena 2019-01-29 10:29:53 +01:00
parent 65972c7145
commit e3f8a36fd5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack/openstack-macros/openstack-macros.spec.j2
View File

@ -2,7 +2,7 @@
%global rdo 1
%endif
Name: openstack-macros
Version: 2018.2.6
Version: 2018.2.7
Release: 0
Summary: OpenStack Packaging - RPM Macros
License: {{ license('Apache-2.0') }}
@ -39,7 +39,7 @@ install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-suse
%if 0%{?rdo}
install -D -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-rdo
%endif
%if 0%{?fedora}
%if 0%{?fedora} || 0%{?rhel} > 7
install -D -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-fedora
%endif