Remove outdated spec conditionals

This commit is contained in:
Miro Hrončok 2023-08-01 18:29:46 +02:00
parent a0ff80559a
commit f8ee99bc22

View File

@ -30,9 +30,7 @@ License: MIT and Python and UCD and BSD and (ASL 2.0 or BSD)
URL: https://www.pypy.org/ URL: https://www.pypy.org/
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10
ExcludeArch: %{ix86} ExcludeArch: %{ix86}
%endif
# High-level configuration of the build: # High-level configuration of the build:
@ -70,7 +68,6 @@ ExcludeArch: %{ix86}
# We refer to this subdir of the source tree in a few places during the build: # We refer to this subdir of the source tree in a few places during the build:
%global goal_dir pypy/goal %global goal_dir pypy/goal
%if 0%{?fedora} >= 36
# REMINDER: When updating the main pypy3 version for a certain Fedora release # REMINDER: When updating the main pypy3 version for a certain Fedora release
# make sure to update the python-classroom group in https://pagure.io/fedora-comps/ # make sure to update the python-classroom group in https://pagure.io/fedora-comps/
# 1. locate comps-fXX.xml.in for each affected Fedora release # 1. locate comps-fXX.xml.in for each affected Fedora release
@ -78,9 +75,6 @@ ExcludeArch: %{ix86}
# 3. change the package name to match the new version # 3. change the package name to match the new version
# 4. submit changes as a pull request and make sure somebody merges it # 4. submit changes as a pull request and make sure somebody merges it
%bcond_without main_pypy3 %bcond_without main_pypy3
%else
%bcond_with main_pypy3
%endif
%ifarch %{ix86} x86_64 %{arm} %ifarch %{ix86} x86_64 %{arm}
%global _package_note_linker gold %global _package_note_linker gold
@ -199,9 +193,7 @@ Provides: pypy3%{?_isa} = %{version}-%{release}
Obsoletes: pypy3 < 7.3.4-4 Obsoletes: pypy3 < 7.3.4-4
# This is when pypy3 was provided by pypy3.8: # This is when pypy3 was provided by pypy3.8:
Conflicts: pypy3 < %{version}-%{release} Conflicts: pypy3 < %{version}-%{release}
%if 0%{?fedora} >= 37
Obsoletes: pypy3.7 < 7.3.9-20 Obsoletes: pypy3.7 < 7.3.9-20
%endif
%if 0%{?fedora} >= 38 %if 0%{?fedora} >= 38
Obsoletes: pypy3.8 < 7.3.11-20 Obsoletes: pypy3.8 < 7.3.11-20
%endif %endif
@ -241,9 +233,7 @@ Requires: emacs-filesystem >= %{_emacs_version}
Provides: pypy3-libs = %{version}-%{release} Provides: pypy3-libs = %{version}-%{release}
Provides: pypy3-libs%{?_isa} = %{version}-%{release} Provides: pypy3-libs%{?_isa} = %{version}-%{release}
Obsoletes: pypy3-libs < 7.3.4-4 Obsoletes: pypy3-libs < 7.3.4-4
%if 0%{?fedora} >= 37
Obsoletes: pypy3.7-libs < 7.3.9-20 Obsoletes: pypy3.7-libs < 7.3.9-20
%endif
%if 0%{?fedora} >= 38 %if 0%{?fedora} >= 38
Obsoletes: pypy3.8-libs < 7.3.11-20 Obsoletes: pypy3.8-libs < 7.3.11-20
%endif %endif
@ -290,9 +280,7 @@ Requires: pypy%{pyversion}-libs%{?_isa} = %{version}-%{release}
%if %{with main_pypy3} %if %{with main_pypy3}
Provides: pypy3-test = %{version}-%{release} Provides: pypy3-test = %{version}-%{release}
Provides: pypy3-test%{?_isa} = %{version}-%{release} Provides: pypy3-test%{?_isa} = %{version}-%{release}
%if 0%{?fedora} >= 37
Obsoletes: pypy3.7-test < 7.3.9-20 Obsoletes: pypy3.7-test < 7.3.9-20
%endif
%if 0%{?fedora} >= 38 %if 0%{?fedora} >= 38
Obsoletes: pypy3.8-test < 7.3.11-20 Obsoletes: pypy3.8-test < 7.3.11-20
%endif %endif
@ -312,9 +300,7 @@ Requires: pypy%{pyversion}-libs%{?_isa} = %{version}-%{release}
Provides: pypy3-devel = %{version}-%{release} Provides: pypy3-devel = %{version}-%{release}
Provides: pypy3-devel%{?_isa} = %{version}-%{release} Provides: pypy3-devel%{?_isa} = %{version}-%{release}
Obsoletes: pypy3-devel < 7.3.4-4 Obsoletes: pypy3-devel < 7.3.4-4
%if 0%{?fedora} >= 37
Obsoletes: pypy3.7-devel < 7.3.9-20 Obsoletes: pypy3.7-devel < 7.3.9-20
%endif
%if 0%{?fedora} >= 38 %if 0%{?fedora} >= 38
Obsoletes: pypy3.8-devel < 7.3.11-20 Obsoletes: pypy3.8-devel < 7.3.11-20
%endif %endif