From 7bc93334156d35efdd09e2dd22a2f2aab1be2a81 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Aug 13 2019 21:46:57 +0000
Subject: python-rpm-macros: make compatible with rhel7.7


Signed-off-by: Kevin Fenzi <kevin@scrye.com>

---

diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec
index 5274291..15b9deb 100644
--- a/python-rpm-macros.spec
+++ b/python-rpm-macros.spec
@@ -1,6 +1,8 @@
+%global rpmmacrodir %{_sysconfdir}/rpm
+
 Name:           python-rpm-macros
 Version:        3
-Release:        25%{?dist}
+Release:        31%{?dist}
 Summary:        The unversioned Python RPM macros
 
 License:        MIT
@@ -11,6 +13,8 @@ Source3:        macros.python3
 Source5:        macros.pybytecompile
 
 BuildArch:      noarch
+# The macro file has been moved from the python-devel package
+Conflicts:      python-devel < 2.7.5-78
 # For %%python3_pkgversion used in %%python_provide
 Requires:       python-srpm-macros
 
@@ -29,6 +33,8 @@ RPM macros for building Python source packages.
 
 %package -n python2-rpm-macros
 Summary:        RPM macros for building Python 2 packages
+# The macro file has been moved from the python-devel package
+Conflicts:      python-devel < 2.7.5-78
 
 %description -n python2-rpm-macros
 RPM macros for building Python 2 packages.
@@ -46,9 +52,9 @@ RPM macros for building Python 3 packages.
 
 %install
 mkdir -p %{buildroot}/%{rpmmacrodir}
-install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE5} \
-  %{buildroot}/%{rpmmacrodir}/
 
+install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
+  %{buildroot}/%{_sysconfdir}/rpm/
 
 %files
 %{rpmmacrodir}/macros.python
@@ -65,6 +71,10 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE5} \
 
 
 %changelog
+* Tue Aug 13 2019 Kevin Fenzi <kevin@scrye.com> - 3-31
+- Update to 3-31 to allow rhel7.7 python2 to install in epel7 buildroot
+- Move macros to the same location the rhel7.7 version of this has.
+
 * Tue Apr 30 2019 Miro Hrončok <mhroncok@redhat.com> - 3-25
 - Split python3-other-rpm-macros from python-rpm-macros to python-epel-rpm-macros