OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=16

BrandingPolicyCheck.py

@@ -57,9 +57,9 @@ class BrandingPolicyCheck(AbstractCheck.AbstractCheck):
 
         # verify that it only supplements with packageand
         found_correct=False
+        correct_supplement="packageand(%s:branding-%s)" % (branding_basename, branding_style)
         for s in pkg_supplements:
             if s.startswith('packageand('):
-                correct_supplement="packageand(%s:branding-%s)" % (branding_basename, branding_style)
                 if s != correct_supplement:
                     printError(pkg,'suse-branding-wrong-branding-supplement', s)
                 else:
@@ -68,7 +68,7 @@ class BrandingPolicyCheck(AbstractCheck.AbstractCheck):
                 printError(pkg,'suse-branding-excessive-supplement', s)
 
         if not found_correct:
-            printError(pkg,'suse-branding-supplement-missing')
+            printError(pkg,'suse-branding-supplement-missing', correct_supplement)
 
         # nothing else
         for r in pkg.recommends():

rpmlint.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Aug  4 14:30:15 CEST 2008 - dmueller@suse.de
+
+- change mandatory-lsb-keyword check to be in line with insserv
+
+-------------------------------------------------------------------
+Tue Jul 29 13:29:12 CEST 2008 - dmueller@suse.de
+
+- remove python-base in the warning as it is confusing.
+  the warning itself is still valid though
+- fix config typo
+
 -------------------------------------------------------------------
 Mon Jul 21 14:57:54 CEST 2008 - dmueller@suse.de
 

rpmlint.spec

@@ -2,9 +2,16 @@
 # spec file for package rpmlint (Version 0.83)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -15,7 +22,7 @@ Name:           rpmlint
 BuildRequires:  rpm-python
 Summary:        Rpm correctness checker
 Version:        0.83
-Release:        15
+Release:        22
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        config
 Source1001:     config.in
@@ -92,6 +99,8 @@ Patch62:        no-badness-return.diff
 Patch63:        suse-factory-config.diff
 Patch64:        pt-gnu-stack.diff
 Patch65:        suse-shlib-devel-dependency.diff
+Patch66:        suse-no-python-base.diff
+Patch67:        suse-required-lsb-tags.diff
 %py_requires
 
 %description
@@ -160,6 +169,8 @@ Authors:
 %patch63
 %patch64
 %patch65
+%patch66
+%patch67
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -198,6 +209,12 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man1/rpmlint.1.gz
 
 %changelog
+* Mon Aug 04 2008 dmueller@suse.de
+- change mandatory-lsb-keyword check to be in line with insserv
+* Tue Jul 29 2008 dmueller@suse.de
+- remove python-base in the warning as it is confusing.
+  the warning itself is still valid though
+- fix config typo
 * Mon Jul 21 2008 dmueller@suse.de
 - enable non-conffile-in-etc warning (bnc#409643)
 - fix shlib policy dependency warnings (bnc#405280)

suse-no-python-base.diff

@@ -0,0 +1,11 @@
+--- FilesCheck.py
++++ FilesCheck.py
+@@ -989,7 +989,7 @@ class FilesCheck(AbstractCheck.AbstractCheck):
+                     if res:
+                         if not (pkg.check_versioned_dep('python-base', res.group(1)) or
+                                 pkg.check_versioned_dep('python', res.group(1))):
+-                            printError(pkg, 'no-dependency-on', 'python-base', res.group(1))
++                            printError(pkg, 'no-dependency-on', 'python', res.group(1))
+                             python_dep_error=1
+ 
+                 # normal executable check

suse-required-lsb-tags.diff

@@ -0,0 +1,11 @@
+--- InitScriptCheck.py
++++ InitScriptCheck.py
+@@ -105,7 +105,7 @@ class InitScriptCheck(AbstractCheck.AbstractCheck):
+                                 
+                         # TODO: where is it specified that these (or some)
+                         #       keywords are mandatory?
+-                        for i in ('Provides', 'Description', 'Short-Description'):
++                        for i in ('Provides', 'Required-Start', 'Required-Stop', 'Default-Start'):
+                             if i not in lsb_tags.keys():
+                                 printError(pkg, 'missing-mandatory-lsb-keyword', "%s in %s" % (i, f))
+                     if in_lsb_tag: