From a5eda5672f3c8ab82c101eafb8e2d2fe8a3312addc4159b5e5a2d1b1c006b23c Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 5 Aug 2020 18:32:27 +0000 Subject: [PATCH] Accepting request 824496 from home:tomdevries:branches:devel:tools:compiler-dwz-fix-rpmlint-warnings - Add dwz-rpmlintrc. Add comment to NoSource directive. OBS-URL: https://build.opensuse.org/request/show/824496 OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/dwz?expand=0&rev=30 --- dwz-rpmlintrc | 25 +++++++++++++++++++++++++ dwz.changes | 15 +++++++++++++++ dwz.spec | 10 ++++++++-- 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 dwz-rpmlintrc diff --git a/dwz-rpmlintrc b/dwz-rpmlintrc new file mode 100644 index 0000000..d65bb5d --- /dev/null +++ b/dwz-rpmlintrc @@ -0,0 +1,25 @@ +# The package should _not_ be noarch, testresults differ from architecture +# to architecture. +addFilter("dwz-testsuite.* no-binary") + +# The rpmlint warning is: +# dwz-testsuite.nosrc: W: invalid-spec-name +# The spec file name (without the .spec suffix) must match the package name +# ("Name:" tag). Either rename your package or the specfile. +# This seems to be a multibuild artifact. The package name is dwz-testsuite, +# but the specfile filename is dwz.spec. The only way we can fix this is by +# reverting to a two-specfile setup. +# +# FTR, the warning comes paired with these grep failures in the "Preparing +# packages log": +# ... testing for empty debuginfo packages +# grep: SOURCES/dwz-testsuite.spec: No such file or directory +# ... running 50-check-filelist +# ... +# ... testing devel dependencies required by libtool .la files +# grep: SOURCES/dwz-testsuite.spec: No such file or directory +# (can be skipped by "skip-check-libtool-deps" anywhere in spec) +# ... running 50-check-packaged-twice +# +# So, skip the rpmlint warning. This doesn't fix the grep fails. +addFilter("dwz-testsuite.* invalid-spec-name") diff --git a/dwz.changes b/dwz.changes index c1b43a2..f6bb415 100644 --- a/dwz.changes +++ b/dwz.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Aug 5 08:16:04 UTC 2020 - Tom de Vries + +- Fix error: source 0 defined multiple times. + +------------------------------------------------------------------- +Wed Aug 5 08:00:30 UTC 2020 - Tom de Vries + +- Silence warning "dwz-rpmlintrc is not mentioned in spec files". + +------------------------------------------------------------------- +Wed Aug 5 06:49:52 UTC 2020 - Tom de Vries + +- Add dwz-rpmlintrc. Add comment to NoSource directive. + ------------------------------------------------------------------- Fri Jan 24 17:08:55 UTC 2020 - Tom de Vries diff --git a/dwz.spec b/dwz.spec index 78bc2e3..f51512b 100644 --- a/dwz.spec +++ b/dwz.spec @@ -1,7 +1,7 @@ # # spec file for package dwz # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -57,7 +57,7 @@ Group: Development/Tools/Building #Git-Clone: git://sourceware.org/git/dwz #Git-Web: https://sourceware.org/git/?p=dwz.git;a=summary Source: dwz-%{version}.tar.xz -Url: https://sourceware.org/dwz/ +URL: https://sourceware.org/dwz/ BuildRequires: libelf-devel BuildRequires: xz %if %{build_testsuite} @@ -70,9 +70,15 @@ BuildRequires: binutils-gold %endif %if !%{build_main} +# It's a bit pointless to ship two identical source packages, one for dwz and +# one for dwz-testsuite. So we make the second one small by excluding the +# source archive. We could do the same for the patches with NoPatch, but the +# gain is smaller there and looks more cumbersome to maintain. NoSource: 0 %endif +Source1: dwz-rpmlintrc + Patch1: dwz-update-version-copyright-message.patch Patch2: dwz-fix-die-no-multifile-propagation.patch Patch3: dwz-fix-assertion-off-cu_size-in-recompute_abbrevs.patch