From a5d3b021f3974d178d1292aff5862e707acb59a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 16 Jul 2020 18:01:14 +0200 Subject: [PATCH] Don't use the %python_sitelib macro, because it errors See https://fedoraproject.org/wiki/Changes/PythonMacroError --- rpmlint-1.11-no-python-macro.patch | 13 +++++++++++++ rpmlint.spec | 10 +++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 rpmlint-1.11-no-python-macro.patch diff --git a/rpmlint-1.11-no-python-macro.patch b/rpmlint-1.11-no-python-macro.patch new file mode 100644 index 0000000..8249a94 --- /dev/null +++ b/rpmlint-1.11-no-python-macro.patch @@ -0,0 +1,13 @@ +diff --git a/TagsCheck.py b/TagsCheck.py +index 4e32520..a30b485 100644 +--- a/TagsCheck.py ++++ b/TagsCheck.py +@@ -437,7 +437,7 @@ oldest_changelog_timestamp = calendar.timegm(time.strptime("1995-01-01", "%Y-%m- + + private_so_paths = set() + for path in ('%perl_archlib', '%perl_vendorarch', '%perl_sitearch', +- '%python_sitearch', '%python2_sitearch', '%python3_sitearch', ++ '%python2_sitearch', '%python3_sitearch', + '%ruby_sitearch', '%php_extdir'): + epath = rpm.expandMacro(path) + if epath and epath != path: diff --git a/rpmlint.spec b/rpmlint.spec index d80e56f..052824d 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -20,7 +20,7 @@ Name: rpmlint Version: 1.11 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Tool for checking common errors in RPM packages License: GPLv2 URL: https://github.com/rpm-software-management/rpmlint @@ -36,6 +36,9 @@ Patch212: rpmlint-1.11-rpm4.15.patch # https://github.com/rpm-software-management/rpmlint/pull/363 # This patch does the same on the 1.11 code Patch213: rpmlint-1.11-libc-warnings.patch +# Don't use the %%python_sitelib macro, because it errors +# See https://fedoraproject.org/wiki/Changes/PythonMacroError +Patch214: rpmlint-1.11-no-python-macro.patch BuildArch: noarch %if %{with python3} @@ -101,6 +104,7 @@ and source packages as well as spec files can be checked. %patch199 -p1 %patch212 -p1 %patch213 -p1 +%patch214 -p1 %if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 # TODO, take upstream (RPM 4.15 related) @@ -158,6 +162,10 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8} %{_mandir}/man1/rpmlint.1* %changelog +* Thu Jul 16 2020 Miro HronĨok - 1.11-10 +- Don't use the %%python_sitelib macro, because it errors +- See https://fedoraproject.org/wiki/Changes/PythonMacroError + * Tue Jun 23 2020 Tom Callaway - 1.11-9 - use python3-file-magic on f33+