diff --git a/rpmlint.changes b/rpmlint.changes index 7cda49b..5491e56 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 19 11:05:54 UTC 2010 - puzel@novell.com + +- update suse version check (add 11.2, drop 10.3) + ------------------------------------------------------------------- Mon Feb 1 10:14:58 UTC 2010 - lnussel@suse.de diff --git a/rpmlint.spec b/rpmlint.spec index 44a6b6e..3402288 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -23,7 +23,7 @@ Name: rpmlint BuildRequires: rpm-python Summary: Rpm correctness checker Version: 0.92 -Release: 2 +Release: 3 Source0: %{name}-%{version}.tar.bz2 Source1: config Source1001: config.in diff --git a/suse-version.diff b/suse-version.diff index ee15775..81dfa53 100644 --- a/suse-version.diff +++ b/suse-version.diff @@ -1,8 +1,8 @@ Index: SpecCheck.py =================================================================== ---- SpecCheck.py.orig -+++ SpecCheck.py -@@ -53,6 +53,7 @@ libdir_regex = re.compile('%{?_lib(?:dir +--- SpecCheck.py.orig 2010-02-19 12:02:55.000000000 +0100 ++++ SpecCheck.py 2010-02-19 12:05:18.000000000 +0100 +@@ -50,6 +50,7 @@ libdir_regex = re.compile('%{?_lib(?:dir comment_or_empty_regex = re.compile('^\s*(#|$)') defattr_regex = re.compile('^\s*%defattr\\b') attr_regex = re.compile('^\s*%attr\\b') @@ -10,20 +10,20 @@ Index: SpecCheck.py section_regexs = dict( ([x, re.compile('^%' + x + '(?:\s|$)')] for x in ('build', 'changelog', 'check', 'clean', 'description', 'files', -@@ -363,6 +364,12 @@ class SpecCheck(AbstractCheck.AbstractCh +@@ -362,6 +363,12 @@ class SpecCheck(AbstractCheck.AbstractCh if res: package_noarch[current_package] = True + res = suse_version_regex.search(line) -+ if res and int(res.group(1)) > 0 and int(res.group(1)) < 1030: ++ if res and int(res.group(1)) > 0 and int(res.group(1)) < 1100: + printWarning(pkg, "obsolete-suse-version-check", res.group(1)) -+ elif res and int(res.group(1)) > 1110: ++ elif res and int(res.group(1)) > 1120: + printError(pkg, "invalid-suse-version-check", res.group(1)) + res = prereq_regex.search(line) if res: printError(pkg, 'prereq-use', res.group(2)) -@@ -673,6 +680,15 @@ set which may result in security issues +@@ -677,6 +684,15 @@ set which may result in security issues depending on the system where the package is built. Add default attributes using %defattr before it in the %files section, or use per line %attr's.''',