Drop python3 macros, require python/python3-rpm-macros

macros.python3.5

@@ -1,16 +0,0 @@
-%__python3 /usr/bin/python3
-%python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-%python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")
-%python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")
-%python3_version_nodots %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3].replace('.',''))")
-%py3dir %{_builddir}/python3-%{name}-%{version}-%{release}
-
-%py3_shbang_opts -s
-
-%py3_build() %{expand:\
-CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3} %{py3_shbang_opts}" %{?1}\
-}
-
-%py3_install() %{expand:\
-CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?1}\
-}

python3.spec

@@ -112,7 +112,7 @@
 Summary: Version 3 of the Python programming language aka Python 3000
 Name: python3
 Version: %{pybasever}.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Python
 Group: Development/Languages
 
@@ -188,10 +188,6 @@ Source1: find-provides-without-python-sonames.sh
 %global _use_internal_dependency_generator 0
 %global __find_provides %{SOURCE1}
 
-# Supply various useful macros for building python 3 modules:
-#  __python3, python3_sitelib, python3_sitearch
-Source2: macros.python%{pybasever}
-
 # Supply an RPM macro "py_byte_compile" for the python3-devel subpackage
 # to enable specfiles to selectively byte-compile individual files and paths
 # with different Python runtimes as necessary:
@@ -520,8 +516,9 @@ Summary: Libraries and header files needed for Python 3 development
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-BuildRequires: python-macros
+BuildRequires: python-rpm-macros
-Requires: python-macros
+Requires: python-rpm-macros
+Requires: python3-rpm-macros
 Conflicts: %{name} < %{version}-%{release}
 
 %description devel
@@ -1012,7 +1009,6 @@ find %{buildroot} \
 
 # Install macros for rpm:
 mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d/
-install -m 644 %{SOURCE2} %{buildroot}/%{_rpmconfigdir}/macros.d/
 install -m 644 %{SOURCE3} %{buildroot}/%{_rpmconfigdir}/macros.d/
 
 # Ensure that the curses module was linked against libncursesw.so, rather than
@@ -1402,7 +1398,6 @@ rm -fr %{buildroot}
 %{_libdir}/pkgconfig/python-%{LDVERSION_optimized}.pc
 %{_libdir}/pkgconfig/python-%{pybasever}.pc
 %{_libdir}/pkgconfig/python3.pc
-%{_rpmconfigdir}/macros.d/macros.python%{pybasever}
 %{_rpmconfigdir}/macros.d/macros.pybytecompile%{pybasever}
 
 %files tools
@@ -1568,6 +1563,9 @@ rm -fr %{buildroot}
 # ======================================================
 
 %changelog
+* Wed Jan 13 2016 Orion Poplwski <orion@cora.nwra.com> - 3.5.1-2
+- Drop python3 macros, require python/python3-rpm-macros
+
 * Mon Dec 14 2015 Robert Kuska <rkuska@redhat.com> - 3.5.1-1
 - Update to 3.5.1
 - Removed patch 199 and 207 (upstream)