From 04f9b03b99f55b565472b60105324b0aa0b8f4c2 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Jul 19 2018 13:01:54 +0000
Subject: Move macros to python-rpm-macros (#1599809)


---

diff --git a/macros.pybytecompile3.4 b/macros.pybytecompile3.4
deleted file mode 100644
index a8b79b2..0000000
--- a/macros.pybytecompile3.4
+++ /dev/null
@@ -1,12 +0,0 @@
-# Note that the path could itself be a python file, or a directory
-
-# Python's compile_all module only works on directories, and requires a max
-# recursion depth
-
-%py_byte_compile()\
-python_binary="%1"\
-bytecode_compilation_path="%2"\
-find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2]) for f in sys.argv[1:]]' || :\
-\
-find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2]) for f in sys.argv[1:]]' || :\
-%{nil}
diff --git a/python34.spec b/python34.spec
index 1d9483d..3c285b0 100644
--- a/python34.spec
+++ b/python34.spec
@@ -153,7 +153,7 @@
 Summary: Version 3 of the Python programming language aka Python 3000
 Name: python%{pyshortver}
 Version: %{pybasever}.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Python
 Group: Development/Languages
 
@@ -232,11 +232,6 @@ Source1: find-provides-without-python-sonames.sh
 %global _use_internal_dependency_generator 0
 %global __find_provides %{SOURCE1}
 
-# 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:
-Source3: macros.pybytecompile%{pybasever}
-
 # Systemtap tapset to make it easier to use the systemtap static probes
 # (actually a template; LIBRARY_PATH will get fixed up during install)
 # Written by dmalcolm; not yet sent upstream
@@ -1377,10 +1372,6 @@ find %{buildroot} -type f -a -name "*.py" -print0 | \
 find %{buildroot} \
     -perm 555 -exec chmod 755 {} \;
 
-# Install macros for rpm:
-mkdir -p %{buildroot}/%{rpmmacrodir}
-install -m 644 %{SOURCE3} %{buildroot}/%{rpmmacrodir}/
-
 # Ensure that the curses module was linked against libncursesw.so, rather than
 # libncurses.so (bug 539917)
 ldd %{buildroot}/%{dynload_dir}/_curses*.so \
@@ -1802,7 +1793,6 @@ rm -fr %{buildroot}
 %if 0%{?main_python3}
 %{_libdir}/pkgconfig/python3.pc
 %endif
-%{rpmmacrodir}/macros.pybytecompile%{pybasever}
 
 %files tools
 %if 0%{?main_python3}
@@ -1966,6 +1956,9 @@ rm -fr %{buildroot}
 # ======================================================
 
 %changelog
+* Thu Jul 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.4.8-2
+- Move macros to python-rpm-macros (#1599809)
+
 * Thu Mar 22 2018 Carl George <carl@george.computer> - 3.4.8-1
 - Latest upstream
 - Patches 242, 248, and 286 merged upstream