Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2013-01-03 13:47:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmlint", Maintainer is "dmuel...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2012-12-21 10:34:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpmlint.new/rpmlint.changes 2013-01-03 13:47:27.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 2 12:40:51 UTC 2013 - dmuel...@suse.com + +- fix incorrect branding require warnings + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.R6KP4l/_old 2013-01-03 13:47:28.000000000 +0100 +++ /var/tmp/diff_new_pack.R6KP4l/_new 2013-01-03 13:47:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rpmlint # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ rpmlint-checks-master.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-checks-master/BrandingPolicyCheck.py new/rpmlint-checks-master/BrandingPolicyCheck.py --- old/rpmlint-checks-master/BrandingPolicyCheck.py 2012-12-20 16:57:00.000000000 +0100 +++ new/rpmlint-checks-master/BrandingPolicyCheck.py 2013-01-02 13:40:19.000000000 +0100 @@ -31,10 +31,13 @@ # verify that only generic branding is required by non-branding packages for r in pkg.requires(): + if r[0].startswith("config("): + continue if (pkg.name.find('-branding-') < 0 and (r[0].find('-theme-') >= 0 or r[0].find('-branding-') >= 0)): printError(pkg,'suse-branding-specific-branding-req', r[0]) - if r[0].endswith('branding') or r[0].endswith('theme'): + if (r[0].endswith('branding') or r[0].endswith('theme')) \ + and not r[0].endswith('-icon-theme'): # XXX: that startswith 1 breaks with openSUSE 20... if (r[1] != rpm.RPMSENSE_EQUAL or not r[2][1].startswith('1')): printError(pkg,'suse-branding-unversioned-requires', r[0]) @@ -103,11 +106,6 @@ if (len(branding_provide) < 2 or branding_provide[1] != rpm.RPMSENSE_EQUAL): printError(pkg, 'suse-branding-unversioned-provides', branding_provide[0]) - for r in pkg.requires(): - if r[0].find('-theme-') >= 0 or r[0].find('-branding-') >= 0: - if (r[1] != rpm.RPMSENSE_EQUAL or not r[2][1].startswith('1')): - printError(pkg, 'suse-branding-unversioned-requires', r[0]) - check=BrandingPolicyCheck() -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org