Remove stuff that conflicts with python3 package
This commit is contained in:
parent
b7f58eaee9
commit
50f1f6a057
|
@ -894,15 +894,6 @@ for Module in %{buildroot}/%{dynload_dir}/*.so ; do
|
|||
esac
|
||||
done
|
||||
|
||||
# Create "/usr/bin/python3-debug", a symlink to the python3 debug binary, to
|
||||
# avoid the user having to know the precise version and ABI flags. (see
|
||||
# e.g. rhbz#676748):
|
||||
%if 0%{?with_debug_build}
|
||||
ln -s \
|
||||
%{_bindir}/python%{LDVERSION_debug} \
|
||||
%{buildroot}%{_bindir}/python3-debug
|
||||
%endif
|
||||
|
||||
#
|
||||
# Systemtap hooks:
|
||||
#
|
||||
|
@ -944,6 +935,15 @@ echo '[ $? -eq 127 ] && echo "Could not find python%{LDVERSION_optimized}-`uname
|
|||
%{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
|
||||
chmod +x %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config
|
||||
|
||||
# Remove stuff that would conflict with python3 package
|
||||
mv %{buildroot}%{_bindir}/python{3,%{pyshortver}}
|
||||
rm %{buildroot}%{_bindir}/*3
|
||||
rm %{buildroot}%{_bindir}/python3-*
|
||||
rm %{buildroot}%{_bindir}/pyvenv
|
||||
rm %{buildroot}%{_libdir}/libpython3.so
|
||||
rm %{buildroot}%{_mandir}/man1/python3.1*
|
||||
rm %{buildroot}%{_libdir}/pkgconfig/python3.pc
|
||||
|
||||
# ======================================================
|
||||
# Running the upstream test suite
|
||||
# ======================================================
|
||||
|
@ -1019,16 +1019,14 @@ CheckPython optimized
|
|||
%files
|
||||
%defattr(-, root, root)
|
||||
%doc LICENSE README
|
||||
%{_bindir}/pydoc*
|
||||
%{_bindir}/python3
|
||||
%{_bindir}/pydoc%{pybasever}
|
||||
%{_bindir}/python%{pybasever}
|
||||
%{_bindir}/python%{pyshortver}
|
||||
%{_bindir}/python%{pybasever}m
|
||||
%{_bindir}/pyvenv
|
||||
%{_bindir}/pyvenv-%{pybasever}
|
||||
%{_mandir}/*/*
|
||||
|
||||
%{pylibdir}/lib2to3
|
||||
%exclude %{pylibdir}/lib2to3/tests
|
||||
|
||||
%dir %{pylibdir}/unittest/
|
||||
%dir %{pylibdir}/unittest/__pycache__/
|
||||
|
@ -1049,12 +1047,7 @@ CheckPython optimized
|
|||
%{pylibdir}/wsgiref
|
||||
%{pylibdir}/xmlrpc
|
||||
|
||||
%dir %{pylibdir}/ensurepip/
|
||||
%dir %{pylibdir}/ensurepip/__pycache__/
|
||||
%{pylibdir}/ensurepip/*.py
|
||||
%{pylibdir}/ensurepip/__pycache__/*%{bytecode_suffixes}
|
||||
%exclude %{pylibdir}/ensurepip/_bundled
|
||||
|
||||
%{pylibdir}/ensurepip/
|
||||
%{pylibdir}/idlelib
|
||||
|
||||
%dir %{pylibdir}/test/
|
||||
|
@ -1203,9 +1196,6 @@ CheckPython optimized
|
|||
%{pylibdir}/sqlite3/*.py
|
||||
%{pylibdir}/sqlite3/__pycache__/*%{bytecode_suffixes}
|
||||
|
||||
%exclude %{pylibdir}/turtle.py
|
||||
%exclude %{pylibdir}/__pycache__/turtle*%{bytecode_suffixes}
|
||||
|
||||
%{pylibdir}/urllib
|
||||
%{pylibdir}/xml
|
||||
|
||||
|
@ -1224,7 +1214,6 @@ CheckPython optimized
|
|||
%{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h}
|
||||
|
||||
%{_libdir}/%{py_INSTSONAME_optimized}
|
||||
%{_libdir}/libpython3.so
|
||||
%if 0%{?with_systemtap}
|
||||
%dir %(dirname %{tapsetdir})
|
||||
%dir %{tapsetdir}
|
||||
|
@ -1233,28 +1222,22 @@ CheckPython optimized
|
|||
%endif
|
||||
|
||||
%{pylibdir}/config-%{LDVERSION_optimized}/*
|
||||
%exclude %{pylibdir}/config-%{LDVERSION_optimized}/Makefile
|
||||
%{_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
|
||||
%{_libdir}/libpython%{LDVERSION_optimized}.so
|
||||
%{_libdir}/pkgconfig/python-%{LDVERSION_optimized}.pc
|
||||
%{_libdir}/pkgconfig/python-%{pybasever}.pc
|
||||
%{_libdir}/pkgconfig/python3.pc
|
||||
%{_rpmconfigdir}/macros.d/macros.pybytecompile%{pybasever}
|
||||
|
||||
%{_bindir}/python3-2to3
|
||||
%{_bindir}/2to3-%{pybasever}
|
||||
%{_bindir}/idle*
|
||||
%{_bindir}/idle%{pybasever}
|
||||
%{pylibdir}/Tools
|
||||
%doc %{pylibdir}/Doc
|
||||
|
||||
%{pylibdir}/tkinter
|
||||
%exclude %{pylibdir}/tkinter/test
|
||||
%{dynload_dir}/_tkinter.%{SOABI_optimized}.so
|
||||
%{pylibdir}/turtle.py
|
||||
%{pylibdir}/__pycache__/turtle*%{bytecode_suffixes}
|
||||
|
@ -1288,7 +1271,6 @@ CheckPython optimized
|
|||
|
||||
# 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:
|
||||
|
|
Loading…
Reference in New Issue