From acba9641e120a6f6e7db15cf002349415f7472a1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 1 Feb 2023 08:10:45 +0000 Subject: [PATCH] Auto sync2gitlab import of python3.11-3.11.1-4.el8.src.rpm --- python3.11.spec | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/python3.11.spec b/python3.11.spec index 6cd74a7..2e78b71 100644 --- a/python3.11.spec +++ b/python3.11.spec @@ -20,7 +20,7 @@ URL: https://www.python.org/ #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 4%{?dist} License: Python @@ -55,11 +55,11 @@ License: Python # IMPORTANT: When bootstrapping, it's very likely the wheels for pip and # setuptools are not available. Turn off the rpmwheels bcond until # the two packages are built with wheels to get around the issue. -%bcond_without bootstrap +%bcond_with bootstrap # Whether to use RPM build wheels from the python-{pip,setuptools}-wheel package # Uses upstream bundled prebuilt wheels otherwise -%bcond_with rpmwheels +%bcond_without rpmwheels # If the rpmwheels condition is disabled, we use the bundled wheel packages # from Python with the versions below. # This needs to be manually updated when we update Python. @@ -521,8 +521,6 @@ Requires: %{pkgname}-libs%{?_isa} = %{version}-%{release} # But we want them when packages BuildRequire python3-devel Requires: (python-rpm-macros if rpm-build) Requires: (python3-rpm-macros if rpm-build) -Requires: (python-modular-rpm-macros if rpm-build) -Suggests: python3.11-rpm-macros # Require alternatives version that implements the --keep-foreign flag Requires(postun): alternatives >= 1.19.1-1 @@ -796,6 +794,7 @@ BuildPython() { --with-dtrace \ --with-lto \ --with-ssl-default-suites=openssl \ + --with-builtin-hashlib-hashes=blake2 \ --without-static-libpython \ %if %{with rpmwheels} --with-wheel-pkg-dir=%{python_wheel_dir} \ @@ -1378,11 +1377,6 @@ fi %{pylibdir}/pydoc_data %{dynload_dir}/_blake2.%{SOABI_optimized}.so -%{dynload_dir}/_md5.%{SOABI_optimized}.so -%{dynload_dir}/_sha1.%{SOABI_optimized}.so -%{dynload_dir}/_sha256.%{SOABI_optimized}.so -%{dynload_dir}/_sha3.%{SOABI_optimized}.so -%{dynload_dir}/_sha512.%{SOABI_optimized}.so %{dynload_dir}/_asyncio.%{SOABI_optimized}.so %{dynload_dir}/_bisect.%{SOABI_optimized}.so @@ -1673,11 +1667,6 @@ fi # ...with debug builds of the built-in "extension" modules: %{dynload_dir}/_blake2.%{SOABI_debug}.so -%{dynload_dir}/_md5.%{SOABI_debug}.so -%{dynload_dir}/_sha1.%{SOABI_debug}.so -%{dynload_dir}/_sha256.%{SOABI_debug}.so -%{dynload_dir}/_sha3.%{SOABI_debug}.so -%{dynload_dir}/_sha512.%{SOABI_debug}.so %{dynload_dir}/_asyncio.%{SOABI_debug}.so %{dynload_dir}/_bisect.%{SOABI_debug}.so @@ -1803,6 +1792,13 @@ fi # ====================================================== %changelog +* Tue Jan 31 2023 Charalampos Stratakis - 3.11.1-4 +- Disable the builtin hashlib hashes except blake2 + +* Mon Jan 30 2023 Charalampos Stratakis - 3.11.1-3 +- Disable bootstrap +- Revert python3.11-rpm-macros requirement + * Mon Jan 30 2023 Charalampos Stratakis - 3.11.1-2 - Fix macros requirements