SHA256
1
0
forked from pool/rpmlint

- Update to version 2.3.0+git20220714.7cb9607:

* Remove trailing ': x%' from 'package-with-huge-docs' error
  * Fix useless-provides
  * digest whitelists: remove now redundant sha256 algorithm specification
  * FileDigestCheck: use sha256 digest algorithm by default
  * dbus-services: adjust to PackageKit etc -> usr config file move (bsc#1201347)
  * dbus-services: adjust to cups etc -> usr config file move (bsc#1201346)
  * dbus-services: adjust to avahi etc -> usr config file move (bsc#1201345)
- Remove upstreamed patch skip-rpmlint-for-rpmlint.patch.

OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=937
This commit is contained in:
Martin Liška 2022-07-15 11:59:24 +00:00 committed by Git OBS Bridge
parent e3b3071e3e
commit 37e5aedcfa
7 changed files with 19 additions and 44 deletions

View File

@ -3,7 +3,7 @@
<param name="versionformat">2.3.0+git%cd.%h</param>
<param name="url">https://github.com/rpm-software-management/rpmlint.git</param>
<param name="scm">git</param>
<param name="revision">761ddf0910eaed2614433c57fc1a7c14b1983ee8</param>
<param name="revision">opensuse</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/rpm-software-management/rpmlint.git</param>
<param name="changesrevision">761ddf0910eaed2614433c57fc1a7c14b1983ee8</param></service></servicedata>
<param name="changesrevision">f9f146f6279720041d9c45458fd1b58eddc98a59</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:20bfe965b97393e8c2f170976bda97404e77619117862c0d93466c82164453d2
size 6752004

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fdb17e0bec678da4ad17c7e55739ba4e39d235d4319ad6ddcd047911e28f4c2f
size 6753808

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Jul 15 11:55:14 UTC 2022 - mliska@suse.cz
- Update to version 2.3.0+git20220714.7cb9607:
* Remove trailing ': x%' from 'package-with-huge-docs' error
* Fix useless-provides
* digest whitelists: remove now redundant sha256 algorithm specification
* FileDigestCheck: use sha256 digest algorithm by default
* dbus-services: adjust to PackageKit etc -> usr config file move (bsc#1201347)
* dbus-services: adjust to cups etc -> usr config file move (bsc#1201346)
* dbus-services: adjust to avahi etc -> usr config file move (bsc#1201345)
- Remove upstreamed patch skip-rpmlint-for-rpmlint.patch.
-------------------------------------------------------------------
Tue Jul 12 20:38:18 UTC 2022 - Martin Liška <mliska@suse.cz>

View File

@ -23,14 +23,13 @@
%define name_suffix -%{flavor}
%endif
Name: rpmlint%{name_suffix}
Version: 2.3.0+git20220712.761ddf0
Version: 2.3.0+git20220714.7cb96072
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

View File

@ -1,37 +0,0 @@
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