From 88f730d02440f0b25f8d52537d1c85a6b049fa7f584ea3105a87371948894aed Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 9 Nov 2016 14:12:43 +0000 Subject: [PATCH] Accepting request 437348 from home:jberry:branches:openSUSE:Factory - Patch lint severity reductions for >= Leap 42.2: 0001-Update-varrun-test-for-Leap-42.2-severity-reduction.patch 0002-Update-license1-test-for-Leap-42.2-severity-reductio.patch OBS-URL: https://build.opensuse.org/request/show/437348 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=413 --- ...est-for-Leap-42.2-severity-reduction.patch | 29 +++++++++++++++++++ ...test-for-Leap-42.2-severity-reductio.patch | 23 +++++++++++++++ rpmlint-tests.changes | 7 +++++ rpmlint-tests.spec | 6 ++++ 4 files changed, 65 insertions(+) create mode 100644 0001-Update-varrun-test-for-Leap-42.2-severity-reduction.patch create mode 100644 0002-Update-license1-test-for-Leap-42.2-severity-reductio.patch diff --git a/0001-Update-varrun-test-for-Leap-42.2-severity-reduction.patch b/0001-Update-varrun-test-for-Leap-42.2-severity-reduction.patch new file mode 100644 index 0000000..b5ec2fa --- /dev/null +++ b/0001-Update-varrun-test-for-Leap-42.2-severity-reduction.patch @@ -0,0 +1,29 @@ +From 4565372c418433d3d8ff47e59924791f62a20b3a Mon Sep 17 00:00:00 2001 +From: Jimmy Berry +Date: Tue, 25 Oct 2016 13:27:06 -0500 +Subject: [PATCH 1/2] Update varrun test for Leap 42.2 severity reduction. + +--- + tests/varrun.ref | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tests/varrun.ref b/tests/varrun.ref +index 9982344..6b0d28a 100644 +--- a/tests/varrun.ref ++++ b/tests/varrun.ref +@@ -1,6 +1,6 @@ +-varrun: E: non-ghost-in-run (Badness: 10000) /run/bar +-varrun: E: non-ghost-in-run (Badness: 10000) /run/lock/foo +-varrun: E: dir-or-file-in-var-run (Badness: 10000) /var/run +-varrun: E: dir-or-file-in-var-run (Badness: 10000) /var/run/bar +-varrun: E: dir-or-file-in-var-lock (Badness: 10000) /var/lock/foo +-1 packages and 0 specfiles checked; 5 errors, 0 warnings. ++varrun: W: non-ghost-in-run /run/bar ++varrun: W: non-ghost-in-run /run/lock/foo ++varrun: W: dir-or-file-in-var-run /var/run ++varrun: W: dir-or-file-in-var-run /var/run/bar ++varrun: W: dir-or-file-in-var-lock /var/lock/foo ++1 packages and 0 specfiles checked; 0 errors, 5 warnings. +-- +2.10.1 + diff --git a/0002-Update-license1-test-for-Leap-42.2-severity-reductio.patch b/0002-Update-license1-test-for-Leap-42.2-severity-reductio.patch new file mode 100644 index 0000000..8d54e5d --- /dev/null +++ b/0002-Update-license1-test-for-Leap-42.2-severity-reductio.patch @@ -0,0 +1,23 @@ +From c2785ac67339fa3253b03bd98f6939d4017c45fd Mon Sep 17 00:00:00 2001 +From: Jimmy Berry +Date: Tue, 25 Oct 2016 13:29:08 -0500 +Subject: [PATCH 2/2] Update license1 test for Leap 42.2 severity reduction. + +--- + tests/license1.ref | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/license1.ref b/tests/license1.ref +index ba3db25..2c7299d 100644 +--- a/tests/license1.ref ++++ b/tests/license1.ref +@@ -1,3 +1,3 @@ +-license1: E: invalid-license (Badness: 100000) GPLv2+ +-license1: E: invalid-license (Badness: 100000) BSD-2-Clause ; BSL-1.0 +-1 packages and 0 specfiles checked; 2 errors, 0 warnings. ++license1: W: invalid-license GPLv2+ ++license1: W: invalid-license BSD-2-Clause ; BSL-1.0 ++1 packages and 0 specfiles checked; 0 errors, 2 warnings. +-- +2.10.1 + diff --git a/rpmlint-tests.changes b/rpmlint-tests.changes index dbe44f7..8bcdf55 100644 --- a/rpmlint-tests.changes +++ b/rpmlint-tests.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 25 18:32:52 UTC 2016 - jberry@suse.com + +- Patch lint severity reductions for >= Leap 42.2: + 0001-Update-varrun-test-for-Leap-42.2-severity-reduction.patch + 0002-Update-license1-test-for-Leap-42.2-severity-reductio.patch + ------------------------------------------------------------------- Mon Jul 25 14:27:40 UTC 2016 - lnussel@suse.de diff --git a/rpmlint-tests.spec b/rpmlint-tests.spec index 8eeb7e9..ecaab4f 100644 --- a/rpmlint-tests.spec +++ b/rpmlint-tests.spec @@ -31,6 +31,8 @@ Group: Development/Tools/Building BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.opensuse.org/ Source: rpmlint-tests-%version.tar.xz +Patch1: 0001-Update-varrun-test-for-Leap-42.2-severity-reduction.patch +Patch2: 0002-Update-license1-test-for-Leap-42.2-severity-reductio.patch %description This package doesn't actually contain any files and is not meant to @@ -39,6 +41,10 @@ regression tests against rpmlint(-mini). %prep %setup -q +%if 0%{?sle_version} >= 120200 +%patch1 -p1 +%patch2 -p1 +%endif %build mkdir rpms