The package rpms/pypy3.8.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/pypy3.8.git/commit/?id=efbf3a3661....
Change:
+%ifarch %{ix86} x86_64 %{arm}
Thanks.
Full change:
============
commit 74537a7b72b2cd96ff685bc54d59bd97a59d8e04
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Thu Mar 3 01:29:09 2022 +0100
Namespace the debugsources to fix installation conflict with other PyPys
diff --git a/pypy3.8.spec b/pypy3.8.spec
index a5af656..189c194 100644
--- a/pypy3.8.spec
+++ b/pypy3.8.spec
@@ -644,7 +644,7 @@ rm -f %{buildroot}%{pypy_include_dir}/README
# Capture the RPython source code files from the build within the debuginfo
# package (rhbz#666975)
-%global pypy_debuginfo_dir /usr/src/debug/pypy-%{version}-src
+%global pypy_debuginfo_dir /usr/src/debug/pypy%{pyversion}-%{version}-src
mkdir -p %{buildroot}%{pypy_debuginfo_dir}
# copy over everything:
@@ -883,6 +883,7 @@ CheckPyPy pypy3-c
* Tue Mar 01 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.8-1.3.8
- Include the Python version in Release to workaround debuginfo conflicts
and make same builds of different PyPy sort in a predictable way (e.g. wrt Obsoletes)
+- Namespace the debugsources to fix installation conflict with other PyPys
- Fixes: rhbz#2053880
- This is no longer the main PyPy 3 on Fedora 36+
- Fixes: rhbz#2059670
commit bfdaa48fa0f6d33a37e49796dc01868a39784ba5
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Mar 1 23:58:59 2022 +0100
Make PyPy 3.9 the main PyPy 3 on Fedora 36+
PyPy 3.7 is the main one on Fedora 35, this is not the main PyPy 3 anywhere.
diff --git a/pypy3.8.spec b/pypy3.8.spec
index b25edaa..a5af656 100644
--- a/pypy3.8.spec
+++ b/pypy3.8.spec
@@ -133,11 +133,7 @@ URL:
http://pypy.org/
# We refer to this subdir of the source tree in a few places during the build:
%global goal_dir pypy/goal
-%if 0%{?fedora} >= 36
-%bcond_without main_pypy3
-%else
%bcond_with main_pypy3
-%endif
%ifarch %{ix86} x86_64 %{arm}
%global _package_note_linker gold
@@ -888,6 +884,8 @@ CheckPyPy pypy3-c
- Include the Python version in Release to workaround debuginfo conflicts
and make same builds of different PyPy sort in a predictable way (e.g. wrt Obsoletes)
- Fixes: rhbz#2053880
+- This is no longer the main PyPy 3 on Fedora 36+
+- Fixes: rhbz#2059670
* Tue Mar 01 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.8-1
- Update to 7.3.8
commit d91ff23d36e82c0c19138b4ee6cfdf3a642b7f0c
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Mar 1 23:57:06 2022 +0100
Include the Python version in Release to workaround debuginfo conflicts
and make pypy versions with otherwise the same version-release always sorted
by Python version as well.
This potentially allows tags like Obsoletes: pypy3 < %{version}-%{release}.
Fixes
https://bugzilla.redhat.com/show_bug.cgi?id=2053880
diff --git a/pypy3.8.spec b/pypy3.8.spec
index 0212949..b25edaa 100644
--- a/pypy3.8.spec
+++ b/pypy3.8.spec
@@ -2,7 +2,12 @@
%global pyversion 3.8
Name: pypy%{pyversion}
Version: %{basever}.8
-Release: 1%{?dist}
+# The Python version is included in Release to workaround debuginfo conflicts
+# and make pypy versions with otherwise the same version-release always sorted
+# by Python version as well.
+# This potentially allows tags like Obsoletes: pypy3 < %%{version}-%%{release}.
+#
https://bugzilla.redhat.com/2053880
+Release: 1.%{pyversion}%{?dist}
Summary: Python %{pyversion} implementation with a Just-In-Time compiler
# PyPy is MIT
@@ -879,6 +884,11 @@ CheckPyPy pypy3-c
%changelog
+* Tue Mar 01 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.8-1.3.8
+- Include the Python version in Release to workaround debuginfo conflicts
+ and make same builds of different PyPy sort in a predictable way (e.g. wrt Obsoletes)
+- Fixes: rhbz#2053880
+
* Tue Mar 01 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.8-1
- Update to 7.3.8
- Fixes: rhbz#2046556
commit 823ff2b6901c24010fe3f662a79884ecb6e237af
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Mar 1 17:31:05 2022 +0100
Update to 7.3.8
diff --git a/.gitignore b/.gitignore
index 19134eb..8429f7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/pypy3.7-v7.3.6-src.tar.bz2
/pypy3.7-v7.3.7-src.tar.bz2
/pypy3.8-v7.3.7-src.tar.bz2
+/pypy3.8-v7.3.8-src.tar.bz2
diff --git a/189-use-rpm-wheels.patch b/189-use-rpm-wheels.patch
index 5b61035..8ac359d 100644
--- a/189-use-rpm-wheels.patch
+++ b/189-use-rpm-wheels.patch
@@ -15,7 +15,7 @@ index 597a1ef9ee..3bfab52083 100644
__all__ = ["version", "bootstrap"]
--_SETUPTOOLS_VERSION = "56.0.0"
+-_SETUPTOOLS_VERSION = "58.1.0"
+_WHEEL_DIR = "/usr/share/python-wheels/"
-_PIP_VERSION = "21.1.1"
diff --git a/pypy3.8.spec b/pypy3.8.spec
index c7496f2..0212949 100644
--- a/pypy3.8.spec
+++ b/pypy3.8.spec
@@ -1,13 +1,14 @@
%global basever 7.3
%global pyversion 3.8
Name: pypy%{pyversion}
-Version: %{basever}.7
-Release: 3%{?dist}
+Version: %{basever}.8
+Release: 1%{?dist}
Summary: Python %{pyversion} implementation with a Just-In-Time compiler
# PyPy is MIT
# Python standard library is Python
# pypy/module/unicodedata is UCD
+# Bundled cffi is is MIT
# Bundled pycparser is is BSD
# Bundled pycparser.ply is BSD
# Bundled bits from cryptography are ASL 2.0 or BSD
@@ -287,7 +288,7 @@ Requires: python-setuptools-wheel
Requires: python-pip-wheel
%else
Provides: bundled(python3dist(pip)) = 21.1.1
-Provides: bundled(python3dist(setuptools)) = 56.0.0
+Provides: bundled(python3dist(setuptools)) = 58.1.0
%endif
# Provides for the bundled libmpdec
@@ -296,8 +297,11 @@ Provides: bundled(mpdecimal) = %{libmpdec_version}
Provides: bundled(libmpdec) = %{libmpdec_version}
}
+# Find the version in lib_pypy/cffi.dist-info/METADATA
+Provides: bundled(python3dist(cffi)) = 1.15.0
+
# Find the version in lib_pypy/cffi/_pycparser/__init__.py
-Provides: bundled(python3dist(pycparser)) = 2.20
+Provides: bundled(python3dist(pycparser)) = 2.21
# Find the version in lib_pypy/cffi/_pycparser/ply/__init__.py
Provides: bundled(python3dist(ply)) = 3.9
@@ -848,6 +852,7 @@ CheckPyPy pypy3-c
%license %{pypyprefix}/LICENSE
%license %{pypyprefix}/lib/pypy%{pyversion}/_cffi_ssl/LICENSE
%license %{pypyprefix}/lib/pypy%{pyversion}/cffi/_pycparser/ply/LICENSE
+%license %{pypyprefix}/lib/pypy%{pyversion}/cffi.dist-info/LICENSE
%license %{pypyprefix}/lib/pypy%{pyversion}/hpy.dist-info/LICENSE
%{pypyprefix}/lib/pypy%{pyversion}/
%{pypyprefix}/site-packages/
@@ -866,7 +871,6 @@ CheckPyPy pypy3-c
%files devel
%dir %{pypy_include_dir}
-%{pypy_include_dir}/*.h
%dir %{pypy_include_dir}/pypy%{pyversion}
%{pypy_include_dir}/pypy%{pyversion}/*.h
%if %{with main_pypy3}
@@ -875,6 +879,10 @@ CheckPyPy pypy3-c
%changelog
+* Tue Mar 01 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.8-1
+- Update to 7.3.8
+- Fixes: rhbz#2046556
+
* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.3.7-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index d769b2c..61a357f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pypy3.8-v7.3.7-src.tar.bz2) =
9e6701cc441d5535968656cfb0cfa9076c364f9ba32bc6f0ef64f06ab343281e2458dbe88791c0e02401457fbf80d367f397fc904f6146bff68e04a15e05fda2
+SHA512 (pypy3.8-v7.3.8-src.tar.bz2) =
d5f124740ac04786cf087436dfe89590997e158b4a6324892b8d8366b50f980222c9f9a1ac627333d7684ffd02846fed0f5c6a8d2bbbfdd4f26192abe2a40963
commit efbf3a36617566de70d28c78eca89e6a16ce7399
Author: Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl>
Date: Tue Jan 25 21:13:36 2022 +0000
Tell package notes that gold is used
diff --git a/pypy3.8.spec b/pypy3.8.spec
index b92f8bb..c7496f2 100644
--- a/pypy3.8.spec
+++ b/pypy3.8.spec
@@ -133,6 +133,9 @@ URL:
http://pypy.org/
%bcond_with main_pypy3
%endif
+%ifarch %{ix86} x86_64 %{arm}
+%global _package_note_linker gold
+%endif
# Source and patches:
Source0:
https://downloads.python.org/pypy/pypy%{pyversion}-v%{version}-src.tar.bz2
commit 6ce261182dce610b705de950809665a3a16245ed
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 21 09:52:45 2022 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/pypy3.8.spec b/pypy3.8.spec
index bbaba87..b92f8bb 100644
--- a/pypy3.8.spec
+++ b/pypy3.8.spec
@@ -2,7 +2,7 @@
%global pyversion 3.8
Name: pypy%{pyversion}
Version: %{basever}.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Python %{pyversion} implementation with a Just-In-Time compiler
# PyPy is MIT
@@ -872,6 +872,9 @@ CheckPyPy pypy3-c
%changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.3.7-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Sat Jan 08 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.7-2
- Rebuilt for
https://fedoraproject.org/wiki/Changes/LIBFFI34
commit 735b46af379d49ff93f3e12d0580bd3fa5c3664b
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Sat Jan 8 20:32:26 2022 +0100
Rebuilt for
https://fedoraproject.org/wiki/Changes/LIBFFI34
diff --git a/pypy3.8.spec b/pypy3.8.spec
index 5a698ab..bbaba87 100644
--- a/pypy3.8.spec
+++ b/pypy3.8.spec
@@ -2,7 +2,7 @@
%global pyversion 3.8
Name: pypy%{pyversion}
Version: %{basever}.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Python %{pyversion} implementation with a Just-In-Time compiler
# PyPy is MIT
@@ -872,6 +872,9 @@ CheckPyPy pypy3-c
%changelog
+* Sat Jan 08 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.7-2
+- Rebuilt for
https://fedoraproject.org/wiki/Changes/LIBFFI34
+
* Thu Nov 11 2021 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.7-1
- Initial pypy3.8 package
- Supplement tox