diff --git a/python3.spec b/python3.spec index cc4b1f4..5bb233d 100644 --- a/python3.spec +++ b/python3.spec @@ -47,13 +47,13 @@ Summary(ru.UTF-8): Язык программирования очень высо Summary(tr.UTF-8): X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili Summary(uk.UTF-8): Мова програмування дуже високого рівня з X-інтерфейсом Name: python3 -Version: %{py_ver}.13 -Release: 2 +Version: %{py_ver}.18 +Release: 1 Epoch: 1 License: PSF Group: Development/Languages/Python Source0: https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz -# Source0-md5: 8847dc6458d1431d0ae0f55942deeb89 +# Source0-md5: 14ea0982a7dd4dbfc3f50537c723df41 Source1: pyconfig.h.in Patch0: %{name}-pythonpath.patch Patch1: %{name}-ac_fixes.patch @@ -77,7 +77,7 @@ BuildRequires: bluez-libs-devel BuildRequires: bzip2-devel BuildRequires: db-devel >= 4 %{?with_info:BuildRequires: emacs >= 21} -BuildRequires: expat-devel >= 1:1.95.7 +BuildRequires: expat-devel >= 1:2.6.2 BuildRequires: file BuildRequires: gdbm-devel >= 1.8.3 %if %(locale -a | grep -q '^C\.utf8$'; echo $?) @@ -106,6 +106,7 @@ BuildRequires: xz-devel BuildRequires: zlib-devel Requires: %{name}-libs = %{epoch}:%{version}-%{release} Suggests: pip +Conflicts: python < 1:2.7.18-10 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define specflags_ppc -D__ppc__=1 @@ -250,6 +251,7 @@ Group: Libraries/Python Requires: %{name}-libs = %{epoch}:%{version}-%{release} %{?with_system_mpdecimal:Requires: mpdecimal >= 2.4.2-2} Obsoletes: python3-modules-sqlite < 1:3.1-2 +%requires_ge_to expat expat-devel %requires_ge_to openssl openssl-devel %description modules @@ -482,20 +484,20 @@ Moduły testowe dla Pythona. %prep %setup -q -n Python-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch7 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 - -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -p1 +%patch -P7 -p1 +%patch -P9 -p1 +%patch -P10 -p1 +%patch -P11 -p1 + +%patch -P13 -p1 +%patch -P14 -p1 +%patch -P15 -p1 %{__rm} -r Modules/expat @@ -674,6 +676,9 @@ install -p Tools/scripts/reindent.py $RPM_BUILD_ROOT%{_bindir}/pyreindent%{py_ve %{__mv} $RPM_BUILD_ROOT%{py_incdir}/pyconfig.h $RPM_BUILD_ROOT%{py_libdir}/config-%{py_platform}/pyconfig.h %{__sed} -e's#@PREFIX@#%{_prefix}#g;s#@PY_VER@#%{py_ver}#g;s#@PY_ABI@#%{py_platform}#g' %{SOURCE1} > $RPM_BUILD_ROOT%{py_incdir}/pyconfig.h +# python points to python3 now +ln -s python3 $RPM_BUILD_ROOT%{_bindir}/python + %clean rm -rf $RPM_BUILD_ROOT @@ -692,6 +697,7 @@ rm -rf $RPM_BUILD_ROOT %if "%{py_ver}" != "%{py_abi}" %attr(755,root,root) %{_bindir}/python%{py_abi} %endif +%attr(755,root,root) %{_bindir}/python %attr(755,root,root) %{_bindir}/python3 %{_mandir}/man1/python3*.1*