From 5384f530caffdcf8469bad7ee4e372433c9cd7bb Mon Sep 17 00:00:00 2001
From: Maxwell G <gotmax@e.email>
Date: Wed, 25 May 2022 14:35:07 -0500
Subject: [PATCH] Remove macros that have been added to RHEL itself.

---
 epel-rpm-macros.spec   |  1 +
 macros.epel-rpm-macros | 65 ++----------------------------------------
 2 files changed, 4 insertions(+), 62 deletions(-)

diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec
index f907bf9..df0ed49 100644
--- a/epel-rpm-macros.spec
+++ b/epel-rpm-macros.spec
@@ -111,6 +111,7 @@ install -Dpm 644 %{SOURCE150} \
 * Tue May 24 2022 Maxwell G <gotmax@e.email> - 8-30
 - Pull in appropriate python3X-rpm-macros package for non-default Python
   versions
+- Remove macros that have been added to RHEL itself.
 
 * Tue May 17 2022 Maxwell G <gotmax@e.email> - 8-29
 - Add `Requires: ansible-srpm-macros`
diff --git a/macros.epel-rpm-macros b/macros.epel-rpm-macros
index e80031d..ef2133a 100644
--- a/macros.epel-rpm-macros
+++ b/macros.epel-rpm-macros
@@ -7,29 +7,11 @@
 %_monodir %{_prefix}/lib/mono
 %_monogacdir %{_monodir}/gac
 
-# A directory for rpm macros
-%rpmmacrodir /usr/lib/rpm/macros.d
-
-# Upstream RPM has this in Fedora, obsoleting the one above.
-%_rpmmacrodir /usr/lib/rpm/macros.d
-
 # Bash completions; not in bash to not intefere with install ordering
-%bash_completion_dir /usr/share/bash-completion/completions/
+%bash_completion_dir %{_datadir}/bash-completion/completions/
 
 # Use the non-underscored Python macros to refer to Python in spec, etc.
 %python2 %__python2
-%python3 %__python3
-
-# Simplified version backported from Fedora
-%py_shebang_fix %{expand:/usr/bin/pathfix.py -pni "%{__python} %{py_shbang_opts}"}
-%py2_shebang_fix %{expand:/usr/bin/pathfix.py -pni "%{__python2} %{py2_shbang_opts}"}
-%py3_shebang_fix %{expand:/usr/bin/pathfix.py -pni "%{__python3} %{py3_shbang_opts}"}
-
-# https://fedoraproject.org/wiki/Changes/Python_Upstream_Architecture_Names
-%python_platform_triplet %(%{__python} -Esc "import sysconfig; print(sysconfig.get_config_var('MULTIARCH'))")
-%python_ext_suffix %(%{__python} -Esc "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")
-%python3_platform_triplet %(%{__python3} -Ic "import sysconfig; print(sysconfig.get_config_var('MULTIARCH'))")
-%python3_ext_suffix %(%{__python3} -Ic "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))")
 
 # Users can use %%python only if they redefined %%__python (e.g. to %%__python3)
 %python() %{lua:\
@@ -41,47 +23,6 @@
     end\
 }
 
-# This only supports Python 3.5+ and will never work with Python 2.
-# Hence, it has no Python version in the name.
-%pycached() %{lua:
-  path = rpm.expand("%{?*}")
-  if (string.sub(path, "-3") ~= ".py") then
-    rpm.expand("%{error:%%pycached can only be used with paths explicitly ending with .py}")
-  else
-    print(path)
-    pyminor = path:match("/python3.(%d+)/") or "*"
-    dirname = path:match("(.*/)")
-    modulename = path:match(".*/([^/]+).py")
-    print("\\n" .. dirname .. "__pycache__/" .. modulename .. ".cpython-3" .. pyminor .. "{,.opt-?}.pyc")
-  end
-}
-
-# This is intended for Python 3 only, hence also no Python version in the name.
-%__pytest /usr/bin/pytest-3
-%pytest %{expand:\\\
-  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\\\
-  PATH="%{buildroot}%{_bindir}:$PATH"\\\
-  PYTHONPATH="${PYTHONPATH:-%{buildroot}%{python3_sitearch}:%{buildroot}%{python3_sitelib}}"\\\
-  PYTHONDONTWRITEBYTECODE=1\\\
-  %__pytest}
-
-%py_provides() %{lua:
-    local name = rpm.expand('%1')
-    if name == '%1' then
-        rpm.expand('%{error:%%py_provides requires at least 1 argument, the name to provide}')
-    end
-    local evr = rpm.expand('%2')
-    if evr == '%2' then
-        evr = rpm.expand('%{?epoch:%{epoch}:}%{version}-%{release}')
-    end
-    print('Provides: ' .. name .. ' = ' .. evr .. '\\n')
-    -- NB: dash needs to be escaped!
-    if name:match('^python3%-') then
-      replaced = name:gsub('^python3%-', 'python-')
-      print('Provides: ' .. replaced .. ' = ' .. evr .. '\\n')
-    end
-}
-
 # With $PATH and $PYTHONPATH set to the %%buildroot,
 # try to import the given Python module(s).
 # Useful as a smoke test in %%check when running tests is not feasible.
@@ -138,6 +79,6 @@
 %python_wheel_pkg_prefix python%{?rhel:%{!?eln:%{python3_pkgversion}}}
 %python_wheel_dir %{_datadir}/%{python_wheel_pkg_prefix}-wheels
 
-# qt5 macro removed from RHEL8 but needed to ensure qtwebengine, and 
-#  it's dependencies build on supported arches.
+# qt5 macro removed from RHEL8 but needed to ensure qtwebengine, and
+#  its dependencies build on supported arches.
 %qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el