openstack
/
rpm-packaging
Code Issues Proposed changes

Setup gpgverify macros only when rhel < 9 

RHEL 9 redhat-rpm-config package includes gpgverify macros so
we don't need to include these in openstack-macros to avoid
conflict with redhat-rpm-config.

Change-Id: I30c34033a20f0ce032c5efcbe96cb47d4ec81bcd
This commit is contained in:
yatinkarel 2021-05-12 11:41:38 +05:30
parent cdb932b141
commit 186f7f214b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
%global rrcdir %{_prefix}/lib/rpm/redhat
%endif
Name: openstack-macros
Version: 2020.1.2
Version: 2020.1.3
Release: 0
Summary: OpenStack Packaging - RPM Macros
License: {{ license('Apache-2.0') }}
@ -40,8 +40,10 @@ install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-suse
%endif
%if 0%{?rdo}
install -D -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-rdo
%if 0%{?rhel} < 9
install -D -m 755 %{SOURCE6} %{buildroot}%{rrcdir}/gpgverify
%endif
%endif
%if 0%{?fedora} || 0%{?rhel} > 7
install -D -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-fedora
%endif
@ -54,8 +56,10 @@ install -D -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-fedo
%endif
%if 0%{?rdo}
%{_sysconfdir}/rpm/macros.openstack-rdo
%if 0%{?rhel} < 9
%{rrcdir}/gpgverify
%endif
%endif
%if 0%{?fedora} || 0%{?rhel} > 7
%{_sysconfdir}/rpm/macros.openstack-fedora
%endif