| |
@@ -1,13 +1,19 @@
|
| |
%global basever 7.3
|
| |
%global pyversion 3.7
|
| |
Name: pypy%{pyversion}
|
| |
- Version: %{basever}.7
|
| |
- Release: 4%{?dist}
|
| |
+ Version: %{basever}.8
|
| |
+ # 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
|
| |
# 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 +302,11 @@
|
| |
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
|
| |
@@ -641,7 +650,7 @@
|
| |
|
| |
# 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:
|
| |
@@ -875,6 +884,15 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Tue Mar 01 2022 Miro Hrončok <mhroncok@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@redhat.com> - 7.3.8-1
|
| |
+ - Update to 7.3.8
|
| |
+
|
| |
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.7-4
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
| |
|
| |
