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

CheckCommonFiles.py

@@ -44,9 +44,14 @@ class CommonFilesCheck(AbstractCheck.AbstractCheck):
                     '0d6be33865b76025c20b48bcac87adb7'):
                 printError(pkg, "generic-build-instructions", f)
 
-            if len(md5) and md5 in (
-                    '94d55d512a9ba36caa9b7df079bae19f'):
-                printError(pkg, "duplicated-file-gpl-v2", f)
+            # bnc 379919
+            #if len(md5) and md5 in (
+            #        '94d55d512a9ba36caa9b7df079bae19f'):
+            #    printError(pkg, "duplicated-file-gpl-v2", f)
+
+            #if len(md5) and md5 in (
+            #        'd32239bcb673463ab874e80d47fae504'):
+            #    printError(pkg, "duplicated-file-gpl-v3", f)
 
             # bsd causes the false positive COPYING.BSD
             if len(md5) and f.rsplit('/',1)[1][0].lower() == 'r' and f.rsplit('.',1)[-1].lower() in (
@@ -69,7 +74,10 @@ if Config.info:
 """Your package contains a file that contains the FSF generic
 configure/make/make install instructions. Those are useless
 for a binary package. Consider removing it to save 3kb of rpm size.""",
-
+'duplicated-file-gpl-v3',
+"""Your package contains a file that contains the FSF GPLv3
+license. If you really have to ship it, consider symlinking it
+from the licenses package.""",
 'duplicated-file-gpl-v2',
 """Your package contains a file that contains the FSF GPLv2
 license. If you really have to ship it, consider symlinking it

naming-policy-lib64.diff

@@ -0,0 +1,24 @@
+--- NamingPolicyCheck.py
++++ NamingPolicyCheck.py
+@@ -85,14 +85,14 @@ check=NamingPolicyCheck()
+ # if somone as a elegant solution, I will be happy to implement and test it.
+ 
+ 
+-check.add_check('xmms', '^xmms-', '^/usr/lib/xmms/')
+-check.add_check('python', '^python-', '^/usr/lib/python[1-9](-[1-9])?')
+-check.add_check('perl5', '^perl-', '^/usr/lib/perl5/vendor_perl')
+-check.add_check('apache2', '^apache2-mod_', '^/usr/lib/apache2-')
++check.add_check('xmms', '^xmms-', '^/usr/lib(64)?/xmms/')
++check.add_check('python', '^python-', '^/usr/lib(64)?/python[1-9](-[1-9])?')
++check.add_check('perl5', '^perl-', '^/usr/lib(64)?/perl5/vendor_perl')
++check.add_check('apache2', '^apache2-mod_', '^/usr/lib(64)?/apache2-')
+ check.add_check('fortune', '^fortune-', '^/usr/share/games/fortunes/')
+-check.add_check('php', '^php-', '/usr/lib/php/extensions/')
+-check.add_check('ruby', '^ruby-', '/usr/lib/ruby/[1-9](-[1-9])?/')
+-check.add_check('ocaml', '^ocaml-', '/usr/lib/ocaml/')
++check.add_check('php', '^php-', '/usr/lib(64)?/php/extensions/')
++check.add_check('ruby', '^ruby-', '/usr/lib(64)?/ruby/[1-9](-[1-9])?/')
++check.add_check('ocaml', '^ocaml-', '/usr/lib(64)?/ocaml/')
+ 
+ # these exception should be added
+ # apache2 => apache2-devel

rpmlint.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun  5 19:45:10 CEST 2008 - dmueller@suse.de
+
+- fix naming policy check for lib64 based archs (bnc#392524)
+
 -------------------------------------------------------------------
 Tue May 13 22:54:08 CEST 2008 - dmueller@suse.de
 

rpmlint.spec

@@ -15,7 +15,7 @@ Name:           rpmlint
 BuildRequires:  rpm-python
 Summary:        Rpm correctness checker
 Version:        0.82
-Release:        49
+Release:        55
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        config
 Source1001:     config.in
@@ -91,6 +91,7 @@ Patch55:        suse-debuginfo.diff
 Patch56:        fix-BinariesCheck-regex.diff
 Patch57:        suse-mono-deps-checks.diff
 Patch58:        add-weak-dependencies.diff
+Patch59:        naming-policy-lib64.diff
 %py_requires
 
 %description
@@ -158,6 +159,7 @@ Authors:
 %patch56
 %patch57
 %patch58
+%patch59
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -196,6 +198,8 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man1/rpmlint.1.gz
 
 %changelog
+* Thu Jun 05 2008 dmueller@suse.de
+- fix naming policy check for lib64 based archs (bnc#392524)
 * Wed May 14 2008 dmueller@suse.de
 - fix typo in kde4 deps check
 * Mon May 05 2008 dmueller@suse.de