[rpms/rpkg] 1.70-1: Merge branch 'epel7' into rawhide

A new commit has been pushed.

Repo   : rpms/rpkg
Branch : 1.70-1
Commit : 597f91484a801e502bd02d27f582051578129d9d
Author : Ondřej Nosek <onosek@redhat.com>
Date   : 2022-02-08T02:29:04+00:00
Stats  : +43/-12 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/rpkg/c/597f91484a801e502bd02d27f582051578129d9d?branch=1.70-1

Log:
Merge branch 'epel7' into rawhide

---
diff --git a/0003-Remove-Environment-Markers-syntax.patch b/0003-Remove-Environment-Markers-syntax.patch
new file mode 100644
index 0000000..f596ce9
--- /dev/null
+++ b/0003-Remove-Environment-Markers-syntax.patch
@@ -0,0 +1,24 @@
+From ac1c2995d17b106bbfd0ab6c84ab022da8b18e3d Mon Sep 17 00:00:00 2001
+From: Ondrej Nosek <onosek@redhat.com>
+Date: Mon, 7 Feb 2022 03:01:11 +0100
+Subject: [PATCH] Remove "Environment Markers" syntax
+
+Signed-off-by: Ondrej Nosek <onosek@redhat.com>
+---
+ requirements/test-pypi.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/requirements/test-pypi.txt b/requirements/test-pypi.txt
+index 830d8c3..b732dcb 100644
+--- a/requirements/test-pypi.txt
++++ b/requirements/test-pypi.txt
+@@ -1,5 +1,5 @@
+ coverage
+-mock == 1.0.1;python_version<"3.3"
++mock == 1.0.1
+ flake8
+ pytest
+ pytest-cov
+-- 
+2.34.1
+

diff --git a/rpkg.spec b/rpkg.spec
index 5929abc..4b32ed3 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -8,18 +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
-
 # RHEL7 is currently the only release that is built for Python 2.
 %if 0%{?fedora} || 0%{?rhel} > 7
 # Disable python2 build by default
@@ -34,6 +22,22 @@ Patch2:         0002-Remove-pytest-coverage-execution.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
 

diff --git a/rpkg.spec b/rpkg.spec
index a40601b..4b32ed3 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -276,6 +276,9 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
 - Changing escaping of dash in docs - older releases (onosek)
 - Changing escaping of dash in docs. (drumian)
 
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.63-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Tue Dec 14 2021 Ondřej Nosek <onosek@redhat.com> - 1.63-6
 - drop nosetests for Python3
 - disable pytest coverage during build