The package rpms/pypy3.7.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.7.git/commit/?id=5ccc949a37....
Change:
+%ifarch %{ix86} x86_64 %{arm}
Thanks.
Full change:
============
commit 59f9342d96d1cc729fc9381c9e6d36454bb7417d
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Thu Mar 3 01:29:04 2022 +0100
Namespace the debugsources to fix installation conflict with other PyPys
diff --git a/pypy3.7.spec b/pypy3.7.spec
index efe632e..200d822 100644
--- a/pypy3.7.spec
+++ b/pypy3.7.spec
@@ -650,7 +650,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:
@@ -887,6 +887,7 @@ CheckPyPy pypy3-c
* Tue Mar 01 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.8-1.3.7
- 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
* Tue Mar 01 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.8-1
commit 2adbba4894a2ff770d82c9477672c2e18ccbf6fe
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Mar 1 23:55:45 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.7.spec b/pypy3.7.spec
index 5927b2a..efe632e 100644
--- a/pypy3.7.spec
+++ b/pypy3.7.spec
@@ -2,7 +2,12 @@
%global pyversion 3.7
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.7
+- 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
commit ea18102de854554ad94b64e765422ec024d6aa80
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Mar 1 16:31:05 2022 +0000
Update to 7.3.8
diff --git a/.gitignore b/.gitignore
index b95796f..a5a5e7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
/pypy3.7-v7.3.5-src.tar.bz2
/pypy3.7-v7.3.6-src.tar.bz2
/pypy3.7-v7.3.7-src.tar.bz2
+/pypy3.7-v7.3.8-src.tar.bz2
diff --git a/pypy3.7.spec b/pypy3.7.spec
index 307aeb3..5927b2a 100644
--- a/pypy3.7.spec
+++ b/pypy3.7.spec
@@ -1,13 +1,14 @@
%global basever 7.3
%global pyversion 3.7
Name: pypy%{pyversion}
-Version: %{basever}.7
-Release: 4%{?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
@@ -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
@@ -875,6 +879,9 @@ CheckPyPy pypy3-c
%changelog
+* Tue Mar 01 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.8-1
+- Update to 7.3.8
+
* Fri Jan 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 7.3.7-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index ce1117b..da44f3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pypy3.7-v7.3.7-src.tar.bz2) =
99099f17682b606864753b76a6a0cdf860bc2bf79588ee53e7d0586d3f8f6ab6820240666bd3646ade6523dd5adc6999116d4db4285c688984dc33d4fa7743c6
+SHA512 (pypy3.7-v7.3.8-src.tar.bz2) =
654852caeeb4f01bd47807283d2cf1c19a504b207be23dc40cf3ca4369a14e8f71773a9641a5074de92acfda24d10092cb4d4778e806258dc23f2cfb4d5eaaae
commit 5ccc949a37b85d6a539a83d49f553b4de05ed22a
Author: Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl>
Date: Tue Jan 25 22:13:36 2022 +0100
Tell package notes that gold is used
diff --git a/pypy3.7.spec b/pypy3.7.spec
index e0f9b77..307aeb3 100644
--- a/pypy3.7.spec
+++ b/pypy3.7.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 65e5beca6eca757771bde4ed8e7f2d41e0f8f7cf
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 21 09:52:36 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.7.spec b/pypy3.7.spec
index 5e05bdd..e0f9b77 100644
--- a/pypy3.7.spec
+++ b/pypy3.7.spec
@@ -2,7 +2,7 @@
%global pyversion 3.7
Name: pypy%{pyversion}
Version: %{basever}.7
-Release: 3%{?dist}
+Release: 4%{?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-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Sat Jan 08 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.7-3
- Rebuilt for
https://fedoraproject.org/wiki/Changes/LIBFFI34
commit 32e68b7a887322be55df657de77c5202f504ab0e
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Sat Jan 8 20:33:00 2022 +0100
Rebuilt for
https://fedoraproject.org/wiki/Changes/LIBFFI34
diff --git a/pypy3.7.spec b/pypy3.7.spec
index fca0a4c..5e05bdd 100644
--- a/pypy3.7.spec
+++ b/pypy3.7.spec
@@ -2,7 +2,7 @@
%global pyversion 3.7
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
+* Sat Jan 08 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.7-3
+- Rebuilt for
https://fedoraproject.org/wiki/Changes/LIBFFI34
+
* Fri Dec 10 2021 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.7-2
- No longer own and provide /usr/bin/pypy3 on Fedora 36+
- That is now owned by pypy3.8
commit 9ea0bb0fb449633afd668521e24ba27e5bdc6dd4
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Fri Dec 10 14:12:18 2021 +0100
No longer own and provide /usr/bin/pypy3 on Fedora 36+
That is now owned by pypy3.8
diff --git a/pypy3.7.spec b/pypy3.7.spec
index e7b257d..fca0a4c 100644
--- a/pypy3.7.spec
+++ b/pypy3.7.spec
@@ -2,7 +2,7 @@
%global pyversion 3.7
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
@@ -127,7 +127,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} >= 35
+%if 0%{?fedora} == 35
%bcond_without main_pypy3
%else
%bcond_with main_pypy3
@@ -872,6 +872,10 @@ CheckPyPy pypy3-c
%changelog
+* Fri Dec 10 2021 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.7-2
+- No longer own and provide /usr/bin/pypy3 on Fedora 36+
+- That is now owned by pypy3.8
+
* Thu Nov 11 2021 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.7-1
- Update to 7.3.7
- Fixes: rhbz#2003682
commit cde65b8b859a1112ae3413ea5b006086b303c39f
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Jan 4 19:35:25 2022 +0100
Declare bundled hpy
diff --git a/pypy3.7.spec b/pypy3.7.spec
index 71f97b7..e7b257d 100644
--- a/pypy3.7.spec
+++ b/pypy3.7.spec
@@ -11,6 +11,7 @@ Summary: Python %{pyversion} implementation with a Just-In-Time
compiler
# Bundled pycparser is is BSD
# Bundled pycparser.ply is BSD
# Bundled bits from cryptography are ASL 2.0 or BSD
+# Bundled hpy is MIT
# LGPL and another free license we'd need to ask spot about are present in some
# java jars that we're not building with atm (in fact, we're deleting them
# before building). If we restore those we'll have to work out the new
@@ -301,6 +302,9 @@ Provides: bundled(python3dist(ply)) = 3.9
# Find the version in lib_pypy/_cffi_ssl/cryptography/__about__.py
Provides: bundled(python3dist(cryptography)) = 2.7
+# Find the version in lib_pypy/hpy.dist-info/METADATA
+Provides: bundled(python3dist(hpy)) = 0.0.3
+
%description libs
Libraries required by the various PyPy implementations of Python %{pyversion}.
commit 19c06ca1e99eeca40b99a42867a43f3333512bd9
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Fri Dec 10 12:14:57 2021 +0100
Include the Python version in the summary and description
diff --git a/pypy3.7.spec b/pypy3.7.spec
index 956b601..71f97b7 100644
--- a/pypy3.7.spec
+++ b/pypy3.7.spec
@@ -3,7 +3,7 @@
Name: pypy%{pyversion}
Version: %{basever}.7
Release: 1%{?dist}
-Summary: Python 3 implementation with a Just-In-Time compiler
+Summary: Python %{pyversion} implementation with a Just-In-Time compiler
# PyPy is MIT
# Python standard library is Python
@@ -251,9 +251,9 @@ Obsoletes: pypy3 < 7.3.4-4
%endif
%description
-PyPy's implementation of Python 3, featuring a Just-In-Time compiler on some CPU
-architectures, and various optimized implementations of the standard types
-(strings, dictionaries, etc)
+PyPy's implementation of Python %{pyversion}, featuring a Just-In-Time compiler
+on some CPU architectures, and various optimized implementations
+of the standard types (strings, dictionaries, etc.).
%if 0%{with_jit}
This build of PyPy has JIT-compilation enabled.
@@ -264,7 +264,7 @@ CPU architecture.
%package libs
-Summary: Run-time libraries used by PyPy implementations of Python 3
+Summary: Run-time libraries used by PyPy implementations of Python %{pyversion}
# We supply an emacs mode for the JIT viewer.
# (This doesn't bring in all of emacs, just the directory structure)
@@ -302,11 +302,11 @@ Provides: bundled(python3dist(ply)) = 3.9
Provides: bundled(python3dist(cryptography)) = 2.7
%description libs
-Libraries required by the various PyPy implementations of Python 3.
+Libraries required by the various PyPy implementations of Python %{pyversion}.
%package devel
-Summary: Development tools for working with PyPy3
+Summary: Development tools for working with PyPy%{pyversion}
Requires: pypy%{pyversion}%{?_isa} = %{version}-%{release}
%if %{with main_pypy3}
@@ -316,7 +316,7 @@ Obsoletes: pypy3-devel < 7.3.4-4
%endif
%description devel
-Header files for building C extension modules against PyPy3
+Header files for building C extension modules against PyPy%{pyversion}.
%prep