forked from pool/rpmlint
Ludwig Nussel
912bea2445
- rpmlint 1.8 update * python 3 fixes * Add support for file triggers * Mechanism to black list certain C calls * new error: non-devel-file-in-devel-package * appdata check configurable * project moved to github * Patches dropped: avoid-mismatched-libregex.diff filename-non-utf8-exception.diff fix-ghost-file-handling.diff save-content-to-an-array.diff fix-TmpFilesCheck-pattern-match.diff move-ghost-file-check-to-TmpFilesCh.diff OBS-URL: https://build.opensuse.org/request/show/346358 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=353
51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
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 b69bead..2e3ba56 100644
|
|
--- a/SpecCheck.py
|
|
+++ b/SpecCheck.py
|
|
@@ -67,6 +67,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',
|
|
@@ -388,6 +389,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))
|
|
@@ -816,6 +823,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),
|