Commit Graph

44 Commits

Author SHA1 Message Date
Fedora Release Engineering
bb591a2e06 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-20 10:43:37 +00:00
Miro Hrončok
024452834a Update to 7.3.11 2022-12-31 21:49:54 +01:00
Miro Hrončok
6414747578 On Fedora 37+, obsolete the pypy3.7 package which is no longer available
pypy3.7 was retired in Fedora 37.

pypy3.9-7.3.9-4.3.9.fc37 is available in Fedora 37
pypy3.7-7.3.9-4.3.7.fc35/36 was the latest available in Fedora 35/36.

Fedora 35/36 users attempting to update to Fedora 37+ are getting
the not-up-to-date pypy3.9-7.3.9-3.3.9.fc37 as that is a version
does not explicitly conflict with their pypy3.7 version.

However, such update has a file conflict and will fail later:

    $ rpm -q pypy3.7
    pypy3.7-7.3.9-4.3.7.fc35.x86_64
    $ rpm -q pypy3.9
    pypy3.9-7.3.9-4.3.9.fc35.x86_64

    $ sudo dnf --releasever=37 --assumeno distro-sync
    ...
    Downgrading:
     pypy3.9                      x86_64 7.3.9-3.3.9.fc37            fedora   14 k
     pypy3.9-libs                 x86_64 7.3.9-3.3.9.fc37            fedora   17 M
    ...
    Error: Transaction test error:
      file /usr/bin/pypy3 from install of pypy3.9-7.3.9-3.3.9.fc37.x86_64 conflicts with file from package pypy3.7-7.3.9-4.3.7.fc35.x86_64

    $ sudo dnf --releasever=37 upgrade
    ...
     Problem 1: package pypy3.9-7.3.9-4.3.9.fc37.x86_64 conflicts with pypy3 < 7.3.9-4.3.9.fc37 provided by pypy3.7-7.3.9-4.3.7.fc35.x86_64
      - cannot install the best update candidate for package pypy3.9-7.3.9-4.3.9.fc35.x86_64
      - problem with installed package pypy3.7-7.3.9-4.3.7.fc35.x86_64
     Problem 2: problem with installed package pypy3.9-7.3.9-4.3.9.fc35.x86_64
      - package pypy3.9-7.3.9-4.3.9.fc35.x86_64 requires pypy3.9-libs(x86-64) = 7.3.9-4.3.9.fc35, but none of the providers can be installed
      - package pypy3.9-7.3.9-4.3.9.fc37.x86_64 conflicts with pypy3 < 7.3.9-4.3.9.fc37 provided by pypy3.7-7.3.9-4.3.7.fc35.x86_64
      - cannot install both pypy3.9-libs-7.3.9-4.3.9.fc37.x86_64 and pypy3.9-libs-7.3.9-4.3.9.fc35.x86_64
      - package pypy3.7-libs-7.3.9-4.3.7.fc35.x86_64 requires /usr/bin/pypy3.7, but none of the providers can be installed
      - cannot install the best update candidate for package pypy3.9-libs-7.3.9-4.3.9.fc35.x86_64
      - problem with installed package pypy3.7-libs-7.3.9-4.3.7.fc35.x86_64

By obsoleting pypy3.7 < 7.3.9-20 we allow some security backports in Fedora 35 and 36.
PyPy 7.3.10+ no longer exists for Python 3.7.
2022-12-02 18:13:35 +01:00
Lumir Balhar
f429fecdd7 Backport fix for CVE-2021-28861 2022-10-10 18:00:52 +02:00
Fedora Release Engineering
6252193c55 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-22 15:51:59 +00:00
Charalampos Stratakis
5ff98c3a99 Security fix for CVE-2015-20107
Fixes: rhbz#2075390
2022-06-29 01:05:42 +02:00
Miro Hrončok
2c45725eb8 Exclude ix86 on F37+
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
2022-03-30 12:06:33 +02:00
Miro Hrončok
9e701cbc65 Update to 7.3.9 2022-03-30 12:06:33 +02:00
Miro Hrončok
d6380f72ef Define %baserelease to make bumpspec work properly 2022-03-30 11:13:27 +02:00
Miro Hrončok
394fb5b0e7 Add a reminder to update comps
Unfortunately, comps do not support virtual provides,
so they need to be updated whenever main pypy3 changes.
2022-03-08 12:12:17 +01:00
Miro Hrončok
5617043856 Conflict with a dynamic version-release of pypy3
Eventually, the version of pypy3.7 in Fedora 35 might be updated.
This way, when users attempt a partial update to Fedora 36+,
the upgrade path will always be preserved.

(Considering we will not bump the base release of 3.7 to be higher than the one here.
This also means we should always update pypy3.9 first over all lower Python versions.)
2022-03-03 12:17:29 +01:00
Miro Hrončok
5e17ad8cbd Namespace the debugsources to fix installation conflict with other PyPys 2022-03-03 12:17:29 +01:00
Miro Hrončok
55260ec6b6 Make PyPy 3.9 the main PyPy 3 on Fedora 36+ 2022-03-03 12:17:29 +01:00
Miro Hrončok
e46ca72767 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
2022-03-03 12:17:00 +01:00
Miro Hrončok
a22e7e57d1 Stop providing pypy3.9(abi) = 7.3, it makes no sense
This was added long time ago to try to mimic python(abi) but in this form
it converged to nonsense.
2022-02-23 02:34:56 +01:00
Miro Hrončok
c2195a845b Update to 7.3.8 final 2022-02-22 19:03:53 +01:00
Miro Hrončok
c45eac312a Add comment above the %soname_version definition 2022-02-22 19:03:53 +01:00
Miro Hrončok
f97fb4af29 Explain how the removed sources list was created 2022-02-22 19:03:53 +01:00
Miro Hrončok
1b34489b24 Add reversed "keep this synced" comments 2022-02-22 19:03:53 +01:00
Miro Hrončok
a426a21cc4 Rename pypy2_build to build_using_pypy2 to be less confusing 2022-02-22 19:03:53 +01:00
Miro Hrončok
da61e64d93 Make -test and -devel require both main package and -libs explicitly
Requiring just the main package would do, but this way it's easier to see directly.

CPython does the same.
2022-02-22 19:03:53 +01:00
Miro Hrončok
a0e5980f84 Nitpick: patch the ELF, not a link to it 2022-02-22 11:56:44 +01:00
Miro Hrončok
d3586d269a Mimic CPython, %exclude ensurepip/_bundled when built with RPM wheels 2022-02-22 11:55:45 +01:00
Miro Hrončok
7926d81ad4 Update to 7.3.8rc2 2022-02-11 09:54:47 +01:00
Miro Hrončok
f83fb49449 Cleanup parts of the installation 2022-02-11 09:54:47 +01:00
Miro Hrončok
49ad6567e8 Remove an useless s390(x) z10 sed, we are at z13+ in Fedora 2022-02-11 09:54:47 +01:00
Miro Hrončok
831c9929b3 Use %{valgrind_arches} 2022-02-11 09:54:47 +01:00
Miro Hrončok
a2df6900a7 Stop shipping C sources, move some headers to -devel, one to -test 2022-02-11 09:54:47 +01:00
Miro Hrončok
b2b5021b67 Create a test subpackage, similar to python3-test 2022-02-11 09:54:47 +01:00
Miro Hrončok
9779ff55f4 Move main %files to the top 2022-02-09 17:54:33 +01:00
Miro Hrončok
c6e52d457c Define %{pypylibdir} for easier %files 2022-02-09 17:53:56 +01:00
Miro Hrončok
70c239aa70 Remove the non-shadow_stack option, it has not been used in years
If desired, it can be salvaged from git history.
2022-02-09 13:05:53 +01:00
Miro Hrončok
8950772c1a Rename use_self_when_building to pypy2_build, make it a bcond 2022-02-09 13:03:38 +01:00
Miro Hrončok
7ab528fd75 Convert bool globals to bconds 2022-02-09 13:00:46 +01:00
Miro Hrončok
d9b44f8678 Remove some unneeded globals 2022-02-09 12:57:36 +01:00
Miro Hrončok
07d1426dd4 Stop requiring pypy3.9 from pypy3.9-libs 2022-02-09 12:54:42 +01:00
Miro Hrončok
5bfc7634fc Remove RHEL 6 conditional 2022-02-09 12:29:50 +01:00
Miro Hrončok
fea8a43609 Remove tl;dr comments and commented out code 2022-02-09 12:28:24 +01:00
Miro Hrončok
ddfaf6f824 Declare bundled cffi 2022-02-09 12:21:52 +01:00
Miro Hrončok
446ee50e4e Move to a CPython-like installation layout 2022-02-09 12:20:36 +01:00
Miro Hrončok
bc25649d52 Set platlibdir 2022-02-09 12:18:11 +01:00
Miro Hrončok
3588ca0647 Build with the default OpenSSL version (i.e. 3 on Fedora 36+) 2022-02-09 12:18:11 +01:00
Miro Hrončok
9886df00eb Not main pypy yet 2022-02-09 12:18:11 +01:00
Miro Hrončok
32ffa63874 PyPy 3.9 2022-02-09 12:18:11 +01:00