From 52fd9b7b6dc5b2a59a669fb83d65381a8fb14be0 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 15 2016 08:24:08 +0000
Subject: import rh-python35-python-3.5.1-11.el7


---

diff --git a/SOURCES/macros.pybytecompile b/SOURCES/macros.pybytecompile
index a8b79b2..96d1826 100644
--- a/SOURCES/macros.pybytecompile
+++ b/SOURCES/macros.pybytecompile
@@ -6,7 +6,5 @@
 %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:]]' || :\
+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]], optimize=opt) for opt in range(2) for f in sys.argv[1:]]' || :\
 %{nil}
diff --git a/SPECS/python.spec b/SPECS/python.spec
index b22a867..a368e63 100644
--- a/SPECS/python.spec
+++ b/SPECS/python.spec
@@ -146,7 +146,7 @@
 Summary: Version 3 of the Python programming language aka Python 3000
 Name: %{?scl_prefix}python
 Version: %{pybasever}.1
-Release: 9%{?dist}
+Release: 11%{?dist}
 License: Python
 Group: Development/Languages
 
@@ -729,7 +729,7 @@ Patch237: 00237-CVE-2016-0772-smtplib.patch
 # https://httpoxy.org/
 # FIXED UPSTREAM: http://bugs.python.org/issue27568
 # Based on a patch by Rémi Rampin
-# Resolves: rhbz#1359173
+# Resolves: rhbz#1359174
 Patch242: 00242-CVE-2016-1000110-httpoxy.patch
 
 
@@ -1391,16 +1391,11 @@ iconv -f iso8859-1 -t utf-8 %{buildroot}/%{pylibdir}/Demo/rpc/README > README.co
 
 # Do bytecompilation with the newly installed interpreter.
 # This is similar to the script in macros.pybytecompile
-# compile *.pyo
-find %{buildroot} -type f -a -name "*.py" -print0 | \
-    LD_LIBRARY_PATH="%{buildroot}%{dynload_dir}/:%{buildroot}%{_libdir}" \
-    PYTHONPATH="%{buildroot}%{_libdir}/python%{pybasever} %{buildroot}%{_libdir}/python%{pybasever}/site-packages" \
-    xargs -0 %{buildroot}%{_bindir}/python%{pybasever} -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("%{buildroot}")[2]) for f in sys.argv[1:]]' || :
 # compile *.pyc
 find %{buildroot} -type f -a -name "*.py" -print0 | \
     LD_LIBRARY_PATH="%{buildroot}%{dynload_dir}/:%{buildroot}%{_libdir}" \
     PYTHONPATH="%{buildroot}%{_libdir}/python%{pybasever} %{buildroot}%{_libdir}/python%{pybasever}/site-packages" \
-    xargs -0 %{buildroot}%{_bindir}/python%{pybasever} -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("%{buildroot}")[2], optimize=0) for f in sys.argv[1:]]' || :
+    xargs -0 %{buildroot}%{_bindir}/python%{pybasever} -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("%{buildroot}")[2], optimize=opt) for opt in range(3) for f in sys.argv[1:]]' || :
 
 # Fixup permissions for shared libraries from non-standard 555 to standard 755:
 find %{buildroot} \
@@ -2000,13 +1995,21 @@ rm -fr %{buildroot}
 # ======================================================
 
 %changelog
-* Fri Aug 05 2016 Charalampos Stratakis <cstratak@redhat.com> - 3.5.1-9
-- Bump release for rebuild
-Resolves: rhbz#1359173
+* Wed Sep 14 2016 Tomas Orsava <torsava@redhat.com> - 3.5.1-11
+- Updated .pyc 'bytecompilation with the newly installed interpreter' to also
+  recompile optimized .pyc files
+- Removed .pyo 'bytecompilation with the newly installed interpreter', as .pyo
+  files are no more
+- Updated %py_byte_compile macro
+Resolves rhbz#1374667
+
+* Fri Aug 05 2016 Charalampos Stratakis <cstratak@redhat.com> - 3.5.1-10
+- Bump release number for rebuild
+Resolves: rhbz#1359174
 
 * Fri Aug 05 2016 Charalampos Stratakis <cstratak@redhat.com> - 3.5.1-8
 - Fix for CVE-2016-1000110 HTTPoxy attack
-Resolves: rhbz#1359173
+Resolves: rhbz#1359174
 
 * Tue Jun 21 2016 Tomas Orsava <torsava@redhat.com> - 3.5.1-7
 - Fix for CVE-2016-0772 python: smtplib StartTLS stripping attack (rhbz#1303647)