From 8ff6f5dc37a68ecb45cd80dca1a27dbcb65d5148 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Thu, 23 Jun 2016 11:00:28 +0200 Subject: [PATCH] Templatize openstack-macros Add RDO support Change-Id: I45e00f9c759915e7ed3197c9322eda890ef10817 --- .../openstack-macros/macros.openstack-rdo | 1 + ...k-macros.spec => openstack-macros.spec.j2} | 20 ++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 openstack/openstack-macros/macros.openstack-rdo rename openstack/openstack-macros/{openstack-macros.spec => openstack-macros.spec.j2} (69%) diff --git a/openstack/openstack-macros/macros.openstack-rdo b/openstack/openstack-macros/macros.openstack-rdo new file mode 100644 index 000000000..2db64beec --- /dev/null +++ b/openstack/openstack-macros/macros.openstack-rdo @@ -0,0 +1 @@ +# RDO macros diff --git a/openstack/openstack-macros/openstack-macros.spec b/openstack/openstack-macros/openstack-macros.spec.j2 similarity index 69% rename from openstack/openstack-macros/openstack-macros.spec rename to openstack/openstack-macros/openstack-macros.spec.j2 index d707fb960..a92a44427 100644 --- a/openstack/openstack-macros/openstack-macros.spec +++ b/openstack/openstack-macros/openstack-macros.spec.j2 @@ -1,12 +1,16 @@ +%if 0%{?rhel} || 0%{?fedora} +%global rdo 1 +%endif Name: openstack-macros Version: 2015.2 Release: 0 Summary: OpenStack Packaging - RPM Macros -License: Apache-2.0 +License: {{ license('Apache-2.0') }} Group: Development/Libraries/Python Url: https://wiki.openstack.org/wiki/Rpm-packaging +Source0: macros.openstack-common Source1: macros.openstack-suse -Source2: macros.openstack-common +Source2: macros.openstack-rdo BuildArch: noarch %description @@ -18,16 +22,22 @@ packages. %build %install +install -D -m644 %{SOURCE0} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-common %if 0%{?suse_version} install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-suse %endif -install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-common +%if 0%{?rdo} +install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.openstack-rdo +%endif %files -%defattr(-,root,root) +%{_sysconfdir}/rpm/macros.openstack-common %if 0%{?suse_version} %{_sysconfdir}/rpm/macros.openstack-suse %endif -%{_sysconfdir}/rpm/macros.openstack-common +%if 0%{?rdo} +%{_sysconfdir}/rpm/macros.openstack-rdo +%endif %changelog +