diff --git a/python2.spec b/python2.spec index cc1258ef3dbe3a74440874bf78a5023864d4afe1..4109e95ce0faa27ff431cbcb2c6dd947196c9324 100644 --- a/python2.spec +++ b/python2.spec @@ -15,7 +15,7 @@ %undefine _debuginfo_subpackages Name: python2 Version: 2.7.16 -Release: 13 +Release: 14 Summary: Python is an interpreted, interactive object-oriented programming language suitable License: Python URL: https://www.python.org/ @@ -108,21 +108,15 @@ Requires: expat glibc gdbm python-setuptools-wheel python-pip-wheel Recommends: python2-setuptools python2-pip -Provides: python = %{version}-%{release} Provides: python27 = %{version}-%{release} Provides: python(abi) = %{pybasever} -Obsoletes: python-libs < %{version}-%{release} -Obsoletes: %{name}-libs < %{version}-%{release} +Obsoletes: python2-libs < %{version}-%{release} +Obsoletes: %{name}2-libs < %{version}-%{release} -Provides: python-libs = %{version}-%{release} -Provides: python-libs%{?_isa} = %{version}-%{release} Provides: %{name}-libs = %{version}-%{release} Provides: %{name}-libs%{?_isa} = %{version}-%{release} -Obsoletes: python-unversioned-command < %{version}-%{release} -Provides: python-unversioned-command = %{version}-%{release} - %description Python 2.x series is the old version that is incompatible with the 3.x series. The EOL of Python 2.x upstream is January 2020, there will no updates, @@ -140,8 +134,6 @@ Provides: tkinter = %{version}-%{release} Provides: tkinter%{?_isa} = %{version}-%{release} Provides: tkinter2 = %{version}-%{release} Provides: tkinter2%{?_isa} = %{version}-%{release} -Provides: python-tkinter = %{version}-%{release} -Provides: python-tkinter%{?_isa} = %{version}-%{release} %description tkinter The Tkinter (Tk interface) program is an graphical user interface for @@ -157,13 +149,6 @@ Requires: pkgconfig Requires: python2-setuptools Requires: openEuler-rpm-config Requires: python3-rpm-generators -Provides: python-devel = %{version}-%{release} -Provides: python-devel%{?_isa} = %{version}-%{release} - -Obsoletes: python-test < %{version}-%{release} - -Provides: python-test = %{version}-%{release} -Provides: python-test%{?_isa} = %{version}-%{release} Obsoletes: %{name}-test < %{version}-%{release} Provides: %{name}-test = %{version}-%{release} @@ -178,8 +163,6 @@ with and native libraries for Python2. Summary: A collection of development tools included with Python 2 Requires: %{name} = %{version}-%{release} Requires: %{name}-tkinter = %{version}-%{release} -Provides: python-tools = %{version}-%{release} -Provides: python-tools%{?_isa} = %{version}-%{release} %description tools This package includes several tools to help with the development of Python 2 @@ -392,6 +375,13 @@ sed -e "s|LIBRARY_PATH|%{_libdir}/%{py_INSTSONAME_debug}|" %{SOURCE1} \ %{__chmod} 755 %{buildroot}%{_libdir}/libpython%{pybasever}.so.1.0 %{__chmod} 755 %{buildroot}%{_libdir}/libpython%{pybasever}_d.so.1.0 +rm %{buildroot}%{_bindir}/python +rm %{buildroot}%{_bindir}/pydoc +rm %{buildroot}%{_bindir}/idle +rm %{buildroot}%{_bindir}/python-config +rm %{buildroot}%{_mandir}/*/python.1* +rm %{buildroot}%{_libdir}/pkgconfig/python.pc +rm %{buildroot}%{_bindir}/python-debug %check #make test || : @@ -400,8 +390,8 @@ sed -e "s|LIBRARY_PATH|%{_libdir}/%{py_INSTSONAME_debug}|" %{SOURCE1} \ %defattr(-,root,root) %license LICENSE %doc README -%{_bindir}/pydoc* -%{_bindir}/{python,python2,python%{pybasever}} +%{_bindir}/pydoc2* +%{_bindir}/{python2,python%{pybasever}} %dir %{_prefix}/lib/python%{pybasever} %dir %{_prefix}/lib/python%{pybasever}/site-packages @@ -503,7 +493,7 @@ sed -e "s|LIBRARY_PATH|%{_libdir}/%{py_INSTSONAME_debug}|" %{SOURCE1} \ %{dynload_dir}/_ctypes_test.so %files tools -%{_bindir}/idle* +%{_bindir}/idle2* %{_bindir}/smtpd*.py* %exclude %{_bindir}/2to3* @@ -515,7 +505,7 @@ sed -e "s|LIBRARY_PATH|%{_libdir}/%{py_INSTSONAME_debug}|" %{SOURCE1} \ /usr/lib/debug/usr/lib64/libpython*.debug-gdb.py* # Analog of the core subpackage's files: -%{_bindir}/python-debug + %{_bindir}/python2-debug %{_bindir}/python%{pybasever}-debug @@ -633,6 +623,12 @@ sed -e "s|LIBRARY_PATH|%{_libdir}/%{py_INSTSONAME_debug}|" %{SOURCE1} \ %{dynload_dir}/_testcapimodule_d.so %changelog +* Sat Feb 29 2020 chengquan - 2.7.16-14 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:change default version from python2 to python3 + * Sat Feb 22 2020 openEuler Buildteam - 2.7.16-13 - Type:bugfix - Id:NA