From 82c8e3c3121bfc46ee11d3df63dcceb6daa0c314 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 16 Apr 2018 16:44:13 -0400 Subject: [PATCH] Ignore useless-provides on debuginfo provides (bz1489096) Applied upstream patch to rpmlint-1.10 via 'git am -3' to resolve changes in diff context. Upstream issue: https://github.com/rpm-software-management/rpmlint/issues/112 Upstream commit: https://github.com/rpm-software-management/rpmlint/commit/e739876 --- ...10-ignore-debuginfo-useless-provides.patch | 36 +++++++++++++++++++ rpmlint.spec | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 rpmlint-1.10-ignore-debuginfo-useless-provides.patch diff --git a/rpmlint-1.10-ignore-debuginfo-useless-provides.patch b/rpmlint-1.10-ignore-debuginfo-useless-provides.patch new file mode 100644 index 0000000..8a97bdc --- /dev/null +++ b/rpmlint-1.10-ignore-debuginfo-useless-provides.patch @@ -0,0 +1,36 @@ +From 7f86c79068be1c83303da30f5f4f030080e6326a Mon Sep 17 00:00:00 2001 +From: Dirk Mueller +Date: Sat, 4 Nov 2017 02:24:30 +0100 +Subject: [PATCH] Ignore useless-provides on debuginfo provides (#112) + +Also flip to set's rather than lists as the main operation +here is lookup, so set()s should be faster. +--- + TagsCheck.py | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/TagsCheck.py b/TagsCheck.py +index a8d87aa..dc890b1 100644 +--- a/TagsCheck.py ++++ b/TagsCheck.py +@@ -823,11 +823,13 @@ class TagsCheck(AbstractCheck.AbstractCheck): + + # TODO: should take versions, <, <=, =, >=, > into account here + # https://bugzilla.redhat.com/460872 +- useless_provides = [] ++ useless_provides = set() + for p in prov_names: +- if prov_names.count(p) != 1 and p not in useless_provides: +- useless_provides.append(p) +- for p in useless_provides: ++ if (prov_names.count(p) != 1 and ++ not p.startswith('debuginfo(') and ++ p not in useless_provides): ++ useless_provides.add(p) ++ for p in sorted(useless_provides): + printError(pkg, 'useless-provides', p) + + for p in pkg.provides(): +-- +2.17.0 + diff --git a/rpmlint.spec b/rpmlint.spec index a74d027..80dd963 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -28,6 +28,8 @@ Source3: %{name}-etc.config Source4: %{name}.config.el4 # EL-5 specific config Source5: %{name}.config.el5 +# https://github.com/rpm-software-management/rpmlint/commit/e739876 +Patch0: rpmlint-1.10-ignore-debuginfo-useless-provides.patch BuildArch: noarch %if %{with python3} BuildRequires: python3-devel @@ -78,6 +80,7 @@ and source packages as well as spec files can be checked. %prep %setup -q -n %{name}-%{name}-%{version} +%patch0 -p1 -b .debuginfo-useless-provides sed -i -e /MenuCheck/d Config.py cp -p config config.example install -pm 644 %{SOURCE3} config @@ -129,6 +132,7 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8} %changelog * Mon Apr 16 2018 Todd Zullinger - 1.10-9 - Update UsrLibBinaryException config to include .build-id +- Ignore useless-provides on debuginfo provides (bz1489096) * Sun Mar 04 2018 Till Maas - 1.10-8 - Update URL (RH #1547150)