From 1fc7f6293b4a3a9e40bccfc2390c4dd5cbe4131a Mon Sep 17 00:00:00 2001
From: Maxwell G <gotmax@e.email>
Date: Tue, 17 May 2022 10:25:39 -0500
Subject: [PATCH] Split macros required for building SRPMs into a separate
 package.

---
 ansible-packaging.spec | 22 ++++++++++++++++++++--
 macros.ansible         |  2 --
 macros.ansible-srpm    |  1 +
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 macros.ansible-srpm

diff --git a/ansible-packaging.spec b/ansible-packaging.spec
index 5833189..4892a56 100644
--- a/ansible-packaging.spec
+++ b/ansible-packaging.spec
@@ -1,6 +1,6 @@
 Name:           ansible-packaging
 Version:        1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        RPM packaging macros and generators for Ansible collections
 
 License:        GPLv3+
@@ -8,12 +8,15 @@ License:        GPLv3+
 Source0:        ansible-generator
 Source1:        ansible.attr
 Source2:        macros.ansible
-Source3:        COPYING
+Source3:        macros.ansible-srpm
+Source4:        COPYING
 
 # Require either ansible-core or a version of ansible 2.9 that supports collections but prefer ansible-core.
 Requires:       (ansible-core or (ansible < 2.10.0 with ansible >= 2.9.10))
 Suggests:       ansible-core
 
+Requires:       ansible-srpm-macros = %{version}-%{release}
+
 # Conflict with anything providing its own copies of these files
 %if ! (0%{?rhel} >= 8)
 Conflicts:      ansible-core < 2.12.1-3
@@ -26,6 +29,13 @@ BuildArch:      noarch
 %{summary}.
 
 
+%package -n ansible-srpm-macros
+Summary: SRPM stage RPM packaging macros for Ansible collections
+
+%description -n ansible-srpm-macros
+%{summary}.
+
+
 %prep
 %autosetup -T -c
 cp -a %{sources} .
@@ -38,6 +48,7 @@ cp -a %{sources} .
 %install
 install -Dpm0644 -t %{buildroot}%{_fileattrsdir} ansible.attr
 install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible
+install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible-srpm
 install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator
 
 
@@ -48,7 +59,14 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator
 %{_rpmconfigdir}/ansible-generator
 
 
+%files -n ansible-srpm-macros
+%{_rpmmacrodir}/macros.ansible-srpm
+
+
 %changelog
+* Tue May 17 2022 Maxwell G <gotmax@e.email> - 1-5
+- Split macros required for building SRPMs into a separate package.
+
 * Tue Apr 26 2022 Maxwell G <gotmax@e.email> - 1-4
 - Restore compatability with f34 and f35.
 
diff --git a/macros.ansible b/macros.ansible
index c8c91fb..7165f8e 100644
--- a/macros.ansible
+++ b/macros.ansible
@@ -1,5 +1,3 @@
-%ansible_collection_url() https://galaxy.ansible.com/%{collection_namespace}/%{collection_name}
-
 %ansible_collection_build() ansible-galaxy collection build
 
 %ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz
diff --git a/macros.ansible-srpm b/macros.ansible-srpm
new file mode 100644
index 0000000..9b208b4
--- /dev/null
+++ b/macros.ansible-srpm
@@ -0,0 +1 @@
+%ansible_collection_url() https://galaxy.ansible.com/%{collection_namespace}/%{collection_name}