From 255d30c7f4d7cfb8e2bb286601ca1f2ab624b1c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 30 Apr 2019 11:25:57 +0200
Subject: [PATCH] Split python3-other-rpm-macros from python-rpm-macros to
 python-epel-rpm-macros

---
 macros.python3_other   | 39 ---------------------------------------
 python-rpm-macros.spec |  9 +++++----
 2 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 macros.python3_other

diff --git a/macros.python3_other b/macros.python3_other
deleted file mode 100644
index 1ce91ec..0000000
--- a/macros.python3_other
+++ /dev/null
@@ -1,39 +0,0 @@
-%__python3_other /usr/bin/python3.4
-
-%python3_other_sitelib %(%{__python3_other} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-%python3_other_sitearch %(%{__python3_other} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
-%python3_other_version %(%{__python3_other} -c "import sys; sys.stdout.write(sys.version[:3])")
-%python3_other_version_nodots %(%{__python3_other} -c "import sys; sys.stdout.write(sys.version[:3].replace('.',''))")
-%python3_other_platform %(%{__python3_other} -Ic "import sysconfig; print(sysconfig.get_platform())")
-
-%py3_other_shbang_opts -s
-
-# Use the slashes after expand so that the command starts on the same line as
-# the macro
-%py3_other_build() %{expand:\\\
-  CFLAGS="%{optflags}" %{__python3_other} %{py_setup} %{?py_setup_args} build --executable="%{__python3_other} %{py3_other_shbang_opts}" %{?*}
-  sleep 1
-}
-
-%py3_other_build_egg() %{expand:\\\
-  CFLAGS="%{optflags}" %{__python3_other} %{py_setup} %{?py_setup_args} bdist_egg %{?*}
-  sleep 1
-}
-
-%py3_other_build_wheel() %{expand:\\\
-  CFLAGS="%{optflags}" %{__python3_other} %{py_setup} %{?py_setup_args} bdist_wheel %{?*}
-  sleep 1
-}
-
-%py3_other_install() %{expand:\\\
-  CFLAGS="%{optflags}" %{__python3_other} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*}
-}
-
-%py3_other_install_egg() %{expand:\\\
-  mkdir -p %{buildroot}%{python3_other_sitelib}
-  easy_install-%{python3_other_version} -m --prefix %{buildroot}%{_prefix} -Z dist/*-py%{python3_other_version}.egg %{?*}
-}
-
-%py3_other_install_wheel() %{expand:\\\
-  pip%{python3_other_version} install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --no-deps
-}
diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec
index 979e1eb..5274291 100644
--- a/python-rpm-macros.spec
+++ b/python-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           python-rpm-macros
 Version:        3
-Release:        24%{?dist}
+Release:        25%{?dist}
 Summary:        The unversioned Python RPM macros
 
 License:        MIT
@@ -8,7 +8,6 @@ Source0:        macros.python
 Source1:        macros.python-srpm
 Source2:        macros.python2
 Source3:        macros.python3
-Source4:        macros.python3_other
 Source5:        macros.pybytecompile
 
 BuildArch:      noarch
@@ -47,7 +46,7 @@ RPM macros for building Python 3 packages.
 
 %install
 mkdir -p %{buildroot}/%{rpmmacrodir}
-install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
+install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE5} \
   %{buildroot}/%{rpmmacrodir}/
 
 
@@ -63,10 +62,12 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}
 
 %files -n python3-rpm-macros
 %{rpmmacrodir}/macros.python3
-%{rpmmacrodir}/macros.python3_other
 
 
 %changelog
+* 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
+
 * Thu Apr 25 2019 Miro Hrončok <mhroncok@redhat.com> - 3-24
 - %%python_provide: Obsolete and provide python36- from python3-
 - %%python_provide: Provide python3- from python36-