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
52 lines
2.3 KiB
Diff
52 lines
2.3 KiB
Diff
From 79b3a5168fc9e2be4f74624a63721e6b77c40020 Mon Sep 17 00:00:00 2001
|
|
From: Some One <nobody@opensuse.org>
|
|
Date: Thu, 9 Apr 2015 14:55:37 +0200
|
|
Subject: [PATCH] suse-version.diff
|
|
|
|
===================================================================
|
|
---
|
|
SpecCheck.py | 16 ++++++++++++++++
|
|
1 file changed, 16 insertions(+)
|
|
|
|
diff --git a/SpecCheck.py b/SpecCheck.py
|
|
index 2b24b43..9ea5c6e 100644
|
|
--- a/SpecCheck.py
|
|
+++ b/SpecCheck.py
|
|
@@ -66,6 +66,7 @@ libdir_regex = re.compile('%{?_lib(?:dir)?\}?\\b')
|
|
comment_or_empty_regex = re.compile('^\s*(#|$)')
|
|
defattr_regex = re.compile('^\s*%defattr\\b')
|
|
attr_regex = re.compile('^\s*%attr\\b')
|
|
+suse_version_regex = re.compile('%suse_version\s*[<>=]+\s*(\d+)')
|
|
section_regexs = dict(
|
|
([x, re.compile('^%' + x + '(?:\s|$)')]
|
|
for x in ('build', 'changelog', 'check', 'clean', 'description', 'files',
|
|
@@ -387,6 +388,12 @@ class SpecCheck(AbstractCheck.AbstractCheck):
|
|
if not res.group(1).startswith('%'):
|
|
printWarning(pkg, 'hardcoded-prefix-tag', res.group(1))
|
|
|
|
+ res = suse_version_regex.search(line)
|
|
+ if res and int(res.group(1)) > 0 and int(res.group(1)) < 1210:
|
|
+ printWarning(pkg, "obsolete-suse-version-check", res.group(1))
|
|
+ elif res and int(res.group(1)) > 1310:
|
|
+ printError(pkg, "invalid-suse-version-check", res.group(1))
|
|
+
|
|
res = prereq_regex.search(line)
|
|
if res:
|
|
printError(pkg, 'prereq-use', res.group(2))
|
|
@@ -815,6 +822,15 @@ in the resulting binary package depending on the build environment and rpmbuild
|
|
version (typically < 4.4). Add default attributes using %defattr before it in
|
|
the %files section, or use per entry %attr's.''',
|
|
|
|
+'obsolete-suse-version-check',
|
|
+'''The specfile contains a comparison of %suse_version against a suse release
|
|
+that is no longer in maintenance. Consider removing obsolete parts of your
|
|
+spec file to make it more readable.''',
|
|
+
|
|
+'invalid-suse-version-check',
|
|
+'''The specfile contains a comparison of %suse_version against a suse release
|
|
+that does not exist. Please double check.''',
|
|
+
|
|
'non-standard-group',
|
|
'''The value of the Group tag in the package is not valid. Valid groups are:
|
|
"%s".''' % '", "'.join(VALID_GROUPS),
|