diff --git a/0001-spectemplate-python-Fix-conditional-for-manual-requi.patch b/0001-spectemplate-python-Fix-conditional-for-manual-requi.patch new file mode 100644 index 0000000..39570ad --- /dev/null +++ b/0001-spectemplate-python-Fix-conditional-for-manual-requi.patch @@ -0,0 +1,25 @@ +From 75861583181839623bc9a6ea63ed7932d18f4f57 Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Thu, 16 Jul 2020 11:19:03 -0400 +Subject: [PATCH] spectemplate-python: Fix conditional for manual requires + +--- + spectemplate-python.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/spectemplate-python.spec b/spectemplate-python.spec +index 08ecffe..3625ca1 100644 +--- a/spectemplate-python.spec ++++ b/spectemplate-python.spec +@@ -25,7 +25,7 @@ BuildRequires: python%{python3_pkgversion}-setuptools + Summary: %{summary} + %{?python_provide:%python_provide python3-%{pypi_name}} + +-%if %{defined python_enable_dependency_generator} || %{defined python_disable_dependency_generator} ++%if %{undefined python_enable_dependency_generator} && %{undefined python_disable_dependency_generator} + # Put manual requires here: + Requires: python%{python3_pkgversion}-foo + %endif +-- +2.26.2 + diff --git a/rpmdevtools.spec b/rpmdevtools.spec index 9cc11ea..19c9d10 100644 --- a/rpmdevtools.spec +++ b/rpmdevtools.spec @@ -1,6 +1,6 @@ Name: rpmdevtools Version: 9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Development Tools # rpmdev-setuptree is GPLv2, everything else GPLv2+ @@ -8,6 +8,9 @@ License: GPLv2+ and GPLv2 URL: https://pagure.io/rpmdevtools Source0: https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz +# Backports from upstream +Patch0001: 0001-spectemplate-python-Fix-conditional-for-manual-requi.patch + BuildArch: noarch # help2man, pod2man, *python for creating man pages BuildRequires: help2man @@ -111,6 +114,9 @@ echo ".so man1/rpmdev-spectool.1" > %{buildroot}%{_mandir}/man1/spectool.1 %changelog +* Thu Jul 16 2020 Neal Gompa - 9.0-2 +- Backport fix for python spec template + * Tue Jul 14 2020 Neal Gompa - 9.0-1 - Update to 9.0