diff --git a/_service b/_service index 2087e88..9f1b8fb 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ 2.3.0+git%cd.%h https://github.com/rpm-software-management/rpmlint.git git - opensuse + 761ddf0910eaed2614433c57fc1a7c14b1983ee8 enable diff --git a/_servicedata b/_servicedata index 51664c3..4e5dc54 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/rpm-software-management/rpmlint.git - 43a2c9424d3978250229477fc28426610c79d9a7 \ No newline at end of file + 761ddf0910eaed2614433c57fc1a7c14b1983ee8 \ No newline at end of file diff --git a/rpmlint-2.3.0+git20220711.46e6323.tar.xz b/rpmlint-2.3.0+git20220711.46e6323.tar.xz deleted file mode 100644 index 623a034..0000000 --- a/rpmlint-2.3.0+git20220711.46e6323.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff3f5fa18ff5cbafd4503b100e5c97e4fce1402d36c4a2dbe6d7354eb22dcddc -size 6752068 diff --git a/rpmlint-2.3.0+git20220712.761ddf0.tar.xz b/rpmlint-2.3.0+git20220712.761ddf0.tar.xz new file mode 100644 index 0000000..80f817f --- /dev/null +++ b/rpmlint-2.3.0+git20220712.761ddf0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20bfe965b97393e8c2f170976bda97404e77619117862c0d93466c82164453d2 +size 6752004 diff --git a/rpmlint.changes b/rpmlint.changes index b54116b..42198e0 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jul 12 20:38:18 UTC 2022 - Martin Liška + +- Update to version 2.3.0+git20220712.761ddf0: + * Improve syntax validation for digests. +- Add skip-rpmlint-for-rpmlint.patch patch that skip linter + this package. + ------------------------------------------------------------------- Mon Jul 11 12:41:48 UTC 2022 - mliska@suse.cz diff --git a/rpmlint.spec b/rpmlint.spec index 948f3ff..c0668a0 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -23,13 +23,14 @@ %define name_suffix -%{flavor} %endif Name: rpmlint%{name_suffix} -Version: 2.3.0+git20220711.46e6323 +Version: 2.3.0+git20220712.761ddf0 Release: 0 Summary: RPM file correctness checker License: GPL-2.0-or-later URL: https://github.com/rpm-software-management/rpmlint Source0: rpmlint-%{version}.tar.xz Patch0: disable-flake.patch +Patch1: skip-rpmlint-for-rpmlint.patch BuildRequires: fdupes BuildRequires: python3-setuptools BuildArch: noarch diff --git a/skip-rpmlint-for-rpmlint.patch b/skip-rpmlint-for-rpmlint.patch new file mode 100644 index 0000000..6952bd9 --- /dev/null +++ b/skip-rpmlint-for-rpmlint.patch @@ -0,0 +1,37 @@ +diff --git a/rpmlint/lint.py b/rpmlint/lint.py +index 7afadbc3..df5437e4 100644 +--- a/rpmlint/lint.py ++++ b/rpmlint/lint.py +@@ -5,6 +5,7 @@ import operator + import os + from pathlib import Path + from pstats import Stats ++import re + import sys + from tempfile import gettempdir + import time +@@ -22,6 +23,8 @@ class Lint(object): + Generic object handling the basic rpmlint operations + """ + ++ rpmlint_package = re.compile(r'/home/abuild/rpmbuild/RPMS/noarch/rpmlint-\d') ++ + def __init__(self, options): + # initialize configuration + self.checks = {} +@@ -53,6 +56,15 @@ class Lint(object): + self.config.configuration['ExtractDir'] = gettempdir() + # initialize output buffer + self.output = Filter(self.config) ++ ++ # Do not run rpmlint on rpmlint package that easily leads ++ # to run-time error as old rpmlint (taken from rpmlint-mini) ++ # uses a modified configuration. ++ for file in self.options['rpmfile']: ++ if self.rpmlint_package.search(str(file)): ++ print('Skipping rpmlint for rpmlint package!') ++ sys.exit(0) ++ + # preload the check list if we not print config + # some of the config values are transformed e.g. to regular + # expressions