forked from pool/rpmlint
Ludwig Nussel
bda5d592a2
- add script update_git.sh based on qemu's to simplify importing a patch series from git after rebasing. * Patches dropped: 0001-Python-3-compatibility-tweaks.patch (upstream) 0001-Set-Python-3.4-magic-number-to-3310.patch (upstream) add-scoring-support.diff (different upstream solution) check-buildroot-during-install.diff (need to fix no-cleaning-of-buildroot check upstream) fix-versioned-prereq.diff (was disabled, not sure what it's useful for) ignore-non-readable-in-etc.diff (filtered anyways) locale-support.diff (drop) locale-update.diff (different upstream solution now) more-verbose-lsb-check.diff (drop) perl-versioned-rpath-deps.diff (upstream) rpmlint-1.5-disallow-var-run-and-var-lock.diff (upstream) rpmlint-1.5-Fix-setgroups-error-name.diff (upstream) rpmlint-decode-fix.diff (different upstream solution) rpmlint-fix-unexpanded-macros-for-array-values.patch (different upstream solution) stricter-tags-check.diff (merged in weak deps and check-for-self-provides.diff) suppress-for-perl-python.diff (use filter instead) suse-binary-info-compile-opts.diff (drop) suse-changelog.patch (change config instead) suse-mono-deps-checks.diff (useful?) suse-required-lsb-tags.diff (different upstream solution) verify-buildrequires.diff (very build system specific, drop) xdg-check-exception.diff (upstream) * renamed patches: script-interpreter-only-for-exec-scripts.diff -> script-interpreter-only-for-exec-sc.diff confusing-invalid-spec-name.patch OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=317
65 lines
2.9 KiB
Diff
65 lines
2.9 KiB
Diff
From ef47fdf1ddf38ef1ff48b31242a75955042f468f Mon Sep 17 00:00:00 2001
|
|
From: Some One <nobody@opensuse.org>
|
|
Date: Thu, 9 Apr 2015 14:55:38 +0200
|
|
Subject: [PATCH] suse-pkg-config-check.diff
|
|
|
|
===================================================================
|
|
---
|
|
TagsCheck.py | 19 ++++++++++++++++++-
|
|
1 file changed, 18 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/TagsCheck.py b/TagsCheck.py
|
|
index d49239f..0a56b7d 100644
|
|
--- a/TagsCheck.py
|
|
+++ b/TagsCheck.py
|
|
@@ -416,6 +416,7 @@ lib_devel_number_regex = re.compile('^lib(.*?)([0-9.]+)(_[0-9.]+)?-devel')
|
|
invalid_url_regex = re.compile(Config.getOption('InvalidURL'), re.IGNORECASE)
|
|
lib_package_regex = re.compile('(?:^(?:compat-)?lib.*?(\.so.*)?|libs?[\d-]*)$', re.IGNORECASE)
|
|
leading_space_regex = re.compile('^\s+')
|
|
+pkg_config_regex = re.compile('^/usr/(?:lib\d*|share)/pkgconfig/')
|
|
license_regex = re.compile('\(([^)]+)\)|\s(?:and|or)\s')
|
|
invalid_version_regex = re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE)
|
|
# () are here for grouping purpose in the regexp
|
|
@@ -634,10 +635,12 @@ class TagsCheck(AbstractCheck.AbstractCheck):
|
|
base = is_devel.group(1)
|
|
dep = None
|
|
has_so = False
|
|
+ has_pc = False
|
|
for fname in pkg.files():
|
|
if fname.endswith('.so'):
|
|
has_so = True
|
|
- break
|
|
+ if pkg_config_regex.match(fname) and fname.endswith('.pc'):
|
|
+ has_pc = True
|
|
if has_so:
|
|
base_or_libs = base + '/' + base + '-libs/lib' + base
|
|
# try to match *%_isa as well (e.g. "(x86-64)", "(x86-32)")
|
|
@@ -674,6 +677,15 @@ class TagsCheck(AbstractCheck.AbstractCheck):
|
|
if prov not in (x[0] for x in pkg.provides()):
|
|
printWarning(pkg, 'no-provides', prov)
|
|
|
|
+ if has_pc:
|
|
+ found_pkg_config_dep = False
|
|
+ for p in (x[0] for x in pkg.provides()):
|
|
+ if (p.startswith("pkgconfig(")):
|
|
+ found_pkg_config_dep = True
|
|
+ break
|
|
+ if not found_pkg_config_dep:
|
|
+ printWarning(pkg, 'no-pkg-config-provides')
|
|
+
|
|
# List of words to ignore in spell check
|
|
ignored_words = set()
|
|
for pf in pkg.files():
|
|
@@ -1112,6 +1124,11 @@ once.''',
|
|
'no-url-tag',
|
|
'''The URL tag is missing. Please add a http or ftp link to the project location.''',
|
|
|
|
+'no-pkg-config-provides',
|
|
+'''The package installs a .pc file but does not provide pkgconfig(..) provides.
|
|
+The most likely reason for that is that it was built without BuildRequires: pkg-config.
|
|
+Please double check your build dependencies.''',
|
|
+
|
|
'name-repeated-in-summary',
|
|
'''The name of the package is repeated in its summary. This is often redundant
|
|
information and looks silly in various programs' output. Make the summary
|