From 2b1f821622f09141425eb70b3663a92c5c25237b Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Tue, 16 Jan 2024 12:25:13 -0800 Subject: [PATCH] Drop Python 2 RPM subpackage from Fedora Fedora no longer provides many of the Python 2 packages we use (such as numpy) so the Python 2 RPM isn't very useful, and adds to the complexity of building the package. --- tools/rpm/IMP-copr.spec.in | 4 ++-- tools/rpm/IMP.spec.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/rpm/IMP-copr.spec.in b/tools/rpm/IMP-copr.spec.in index a141795f09..6880706d2f 100644 --- a/tools/rpm/IMP-copr.spec.in +++ b/tools/rpm/IMP-copr.spec.in @@ -1,5 +1,5 @@ # On modern Fedora/RHEL, use Python 3 by default (and provide an IMP-python2 -# subpackage; on RHEL 9 or later, use Python 3 only). +# subpackage for RHEL 8 or older Fedora). # On older systems, the IMP package uses Python 2 only. %if 0%{?fedora} > 12 || 0%{?rhel} >= 8 %define with_python3 1 @@ -13,7 +13,7 @@ %define default_python python2 %endif -%if 0%{?rhel} >= 9 +%if 0%{?rhel} >= 9 || 0%{?fedora} > 37 %define with_python2 0 %else %define with_python2 1 diff --git a/tools/rpm/IMP.spec.in b/tools/rpm/IMP.spec.in index a9ba5d4d28..d7481fd46c 100644 --- a/tools/rpm/IMP.spec.in +++ b/tools/rpm/IMP.spec.in @@ -1,5 +1,5 @@ # On modern Fedora/RHEL, use Python 3 by default (and provide an IMP-python2 -# subpackage; on RHEL 9 or later, use Python 3 only). +# subpackage for RHEL 8 or older Fedora). # On older systems, the IMP package uses Python 2 only. %if 0%{?fedora} > 12 || 0%{?rhel} >= 8 %define with_python3 1 @@ -11,7 +11,7 @@ %define default_python python2 %endif -%if 0%{?rhel} >= 9 +%if 0%{?rhel} >= 9 || 0%{?fedora} > 37 %define with_python2 0 %else %define with_python2 1