[rpms/rpkg] 1.70-1: Apply previous patch only for Python 2

[rpms/rpkg] 1.70-1: Apply previous patch only for Python 2

[@ 2026-08-10 21:44 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : e6bc1a59f5e12d3ade80ab7ad6b36a7372850b30
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2022-02-08T02:24:44+00:00
            Stats  : +16/-13 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/e6bc1a59f5e12d3ade80ab7ad6b36a7372850b30?branch=1.70-1

            Log:
            Apply previous patch only for Python 2

Signed-off-by: Ondřej Nosek <onosek@redhat.com>

---
diff --git a/rpkg.spec b/rpkg.spec
index a460ec2..a40601b 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -8,19 +8,6 @@ URL:            https://pagure.io/rpkg
 BuildArch:      noarch
 Source0:        https://pagure.io/releases/rpkg/%{name}-%{version}.tar.gz
 
-# Fix for bug 1579367
-# Due to https://pagure.io/koji/issue/912, python[23]-koji package does not
-# have egginfo.
-# rpm-py-installer is required as a proxy to install RPM python binding
-# library, so rpm is the actual requirement that must be present in the
-# requires.txt. But, rpkg has to work in all active Fedora and EPEL releases,
-# and there is only old rpm-python package in EL6 and 7, so just simply to
-# remove rpm-py-installer for now.
-Patch0:         remove-koji-and-rpm-py-installer-from-requires.patch
-Patch1:         0001-Do-not-use-pytest-related-dependencies-temporarily.patch
-Patch2:         0002-Remove-pytest-coverage-execution.patch
-Patch3:         0003-Remove-Environment-Markers-syntax.patch
-
 # RHEL7 is currently the only release that is built for Python 2.
 %if 0%{?fedora} || 0%{?rhel} > 7
 # Disable python2 build by default
@@ -35,6 +22,22 @@ Patch3:         0003-Remove-Environment-Markers-syntax.patch
 %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %endif
 
+
+# Fix for bug 1579367
+# Due to https://pagure.io/koji/issue/912, python[23]-koji package does not
+# have egginfo.
+# rpm-py-installer is required as a proxy to install RPM python binding
+# library, so rpm is the actual requirement that must be present in the
+# requires.txt. But, rpkg has to work in all active Fedora and EPEL releases,
+# and there is only old rpm-python package in EL6 and 7, so just simply to
+# remove rpm-py-installer for now.
+Patch0:         remove-koji-and-rpm-py-installer-from-requires.patch
+Patch1:         0001-Do-not-use-pytest-related-dependencies-temporarily.patch
+Patch2:         0002-Remove-pytest-coverage-execution.patch
+%if 0%{?with_python2}
+Patch3:         0003-Remove-Environment-Markers-syntax.patch
+%endif
+
 %description
 Python library for interacting with rpm+git