openstack/rpm-packaging
Code Issues Proposed changes

Merge "macros: move rpm macros to %%_rpmmacrodir"

Browse Source
This commit is contained in:
Zuul
2021-08-09 18:40:20 +00:00
committed by Gerrit Code Review
parent 1bcf3a0b9f 1f456aa93a
commit d067e5e98f
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
%global rrcdir %{_prefix}/lib/rpm/redhat %global rrcdir %{_prefix}/lib/rpm/redhat
%endif %endif
Name: openstack-macros Name: openstack-macros
Version: 2020.1.3 Version: 2021.1.0
Release: 0 Release: 0
Summary: OpenStack Packaging - RPM Macros Summary: OpenStack Packaging - RPM Macros
License: {{ license('Apache-2.0') }} License: {{ license('Apache-2.0') }}
@@ -33,35 +33,35 @@ packages.
%build %build
%install %install
install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-common install -D -m644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.openstack-common
install -D -m644 %{SOURCE5} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-singlespec install -D -m644 %{SOURCE5} %{buildroot}%{_rpmmacrodir}/macros.openstack-singlespec
%if 0%{?suse_version} %if 0%{?suse_version}
install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-suse install -D -m644 %{SOURCE2} %{buildroot}%{_rpmmacrodir}/macros.openstack-suse
%endif %endif
%if 0%{?rdo} %if 0%{?rdo}
install -D -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-rdo install -D -m644 %{SOURCE3} %{buildroot}%{_rpmmacrodir}/macros.openstack-rdo
%if 0%{?rhel} < 9 %if 0%{?rhel} < 9
install -D -m 755 %{SOURCE6} %{buildroot}%{rrcdir}/gpgverify install -D -m 755 %{SOURCE6} %{buildroot}%{rrcdir}/gpgverify
%endif %endif
%endif %endif
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
install -D -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-fedora install -D -m644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/macros.openstack-fedora
%endif %endif
%files %files
%{_sysconfdir}/rpm/macros.openstack-common %{_rpmmacrodir}/macros.openstack-common
%{_sysconfdir}/rpm/macros.openstack-singlespec %{_rpmmacrodir}/macros.openstack-singlespec
%if 0%{?suse_version} %if 0%{?suse_version}
%{_sysconfdir}/rpm/macros.openstack-suse %{_rpmmacrodir}/macros.openstack-suse
%endif %endif
%if 0%{?rdo} %if 0%{?rdo}
%{_sysconfdir}/rpm/macros.openstack-rdo %{_rpmmacrodir}/macros.openstack-rdo
%if 0%{?rhel} < 9 %if 0%{?rhel} < 9
%{rrcdir}/gpgverify %{rrcdir}/gpgverify
%endif %endif
%endif %endif
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
%{_sysconfdir}/rpm/macros.openstack-fedora %{_rpmmacrodir}/macros.openstack-fedora
%endif %endif
%changelog %changelog