From 851697dc0ed41de8d30d7396cf0b5ab5b6dc7b60 Mon Sep 17 00:00:00 2001
From: Tomas Orsava <torsava@redhat.com>
Date: Nov 22 2017 16:27:59 +0000
Subject: Make the python36- files declarations cleaner


---

diff --git a/python3.spec b/python3.spec
index 81f71ce..0c91898 100644
--- a/python3.spec
+++ b/python3.spec
@@ -1202,14 +1202,6 @@ fi
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
-%if %{with platform_python}
-%files -n python3
-%license LICENSE
-%doc README.rst
-%{_bindir}/python3
-%{_bindir}/python%{pybasever}
-%{_mandir}/*/*
-%endif
 
 %files -n python%{python3_pkgversion}
 %defattr(-, root, root)
@@ -1217,9 +1209,14 @@ fi
 %doc README.rst
 %if %{with platform_python}
 %{_libexecdir}/platform-python
-%exclude %{_libexecdir}/system-python
-%exclude %{_bindir}/*
-%else
+%endif
+
+%if %{with platform_python}
+%files -n python3
+%license LICENSE
+%doc README.rst
+%endif
+
 %{_bindir}/pydoc*
 %{_bindir}/python3
 %{_bindir}/python%{pybasever}
@@ -1229,7 +1226,7 @@ fi
 %{_mandir}/*/*
 # Remove in Fedora 29:
 %{_libexecdir}/system-python
-%endif
+
 
 %if %{with platform_python}
 %files -n python3-libs
@@ -1462,10 +1459,6 @@ fi
 %doc systemtap-example.stp pyfuntop.stp
 %endif
 
-%if %{with platform_python}
-%files -n python3-devel
-%doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit
-%endif
 
 %files -n python%{python3_pkgversion}-devel
 %defattr(-,root,root)
@@ -1475,11 +1468,6 @@ fi
 %{_includedir}/python%{LDVERSION_optimized}/*.h
 %exclude %{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h}
 %doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit
-%{_bindir}/python3-config
-%{_bindir}/python%{pybasever}-config
-%{_bindir}/python%{LDVERSION_optimized}-config
-%{_bindir}/python%{LDVERSION_optimized}-*-config
-%{_bindir}/pathfix.py
 %{_libdir}/libpython%{LDVERSION_optimized}.so
 %{_libdir}/pkgconfig/python-%{LDVERSION_optimized}.pc
 %{_libdir}/pkgconfig/python-%{pybasever}.pc
@@ -1488,21 +1476,35 @@ fi
 %{_rpmconfigdir}/macros.d/macros.systempython
 
 %if %{with platform_python}
-%files -n python3-tools
+%files -n python3-devel
+%doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit
 %endif
 
+%{_bindir}/python3-config
+%{_bindir}/python%{pybasever}-config
+%{_bindir}/python%{LDVERSION_optimized}-config
+%{_bindir}/python%{LDVERSION_optimized}-*-config
+%{_bindir}/pathfix.py
+
+
 %files -n python%{python3_pkgversion}-tools
 %defattr(-,root,root,755)
+%{pylibdir}/Tools
+
+%if %{with platform_python}
+%files -n python3-tools
+%endif
+
 %{_bindir}/2to3
 # TODO: Remove 2to3-3.7 once rebased to 3.7
 %{_bindir}/2to3-%{pybasever}
 %{_bindir}/idle*
-%{pylibdir}/Tools
 %doc %{pylibdir}/Doc
 %{_datadir}/appdata/idle3.appdata.xml
 %{_datadir}/applications/idle3.desktop
 %{_datadir}/icons/hicolor/*/apps/idle3.*
 
+
 %if %{with platform_python}
 %files -n python3-tkinter
 %endif
@@ -1520,6 +1522,7 @@ fi
 %dir %{pylibdir}/turtledemo/__pycache__/
 %{pylibdir}/turtledemo/__pycache__/*%{bytecode_suffixes}
 
+
 %if %{with platform_python}
 %files -n python3-test
 %endif
@@ -1546,17 +1549,9 @@ fi
 # all of the other subpackages
 
 %if %{with debug_build}
-%if %{with platform_python}
-%files -n python3-debug
-%endif
-
 %files -n python%{python3_pkgversion}-debug
 %defattr(-,root,root,-)
 
-# Analog of the core subpackage's files:
-%{_bindir}/python%{LDVERSION_debug}
-%{_bindir}/python3-debug
-
 # Analog of the -libs subpackage's files:
 # ...with debug builds of the built-in "extension" modules:
 
@@ -1640,8 +1635,6 @@ fi
 # Analog of the -devel subpackage's files:
 %{pylibdir}/config-%{LDVERSION_debug}-%{_arch}-linux%{_gnu}
 %{_includedir}/python%{LDVERSION_debug}
-%{_bindir}/python%{LDVERSION_debug}-config
-%{_bindir}/python%{LDVERSION_debug}-*-config
 %{_libdir}/libpython%{LDVERSION_debug}.so
 %{_libdir}/libpython%{LDVERSION_debug}.so.1.0
 %{_libdir}/pkgconfig/python-%{LDVERSION_debug}.pc
@@ -1659,8 +1652,21 @@ fi
 %{dynload_dir}/_testcapi.%{SOABI_debug}.so
 %{dynload_dir}/_testimportmultiple.%{SOABI_debug}.so
 
+
+%if %{with platform_python}
+%files -n python3-debug
+%endif
+
+# Analog of the core subpackage's files:
+%{_bindir}/python%{LDVERSION_debug}
+%{_bindir}/python3-debug
+
+%{_bindir}/python%{LDVERSION_debug}-config
+%{_bindir}/python%{LDVERSION_debug}-*-config
+
 %endif # with debug_build
 
+
 # We put the debug-gdb.py file inside /usr/lib/debug to avoid noise from ldconfig
 # See https://bugzilla.redhat.com/show_bug.cgi?id=562980
 #