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

LibraryPolicyCheck.py

@@ -38,7 +38,6 @@ _policy_legacy_exceptions = (
         "libauthpgsql0",
         "libauthpipe0",
         "libauthuserdb0",
-        "libbluetooth2",
         "libcairo2",
         "libcairomm-1_0-1",
         "libcap1",

rpmlint.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep  3 13:58:22 CEST 2008 - dmueller@suse.de
+
+- add description for useless-explicit-requires (bnc#405887)
+
 -------------------------------------------------------------------
 Thu Aug 21 00:30:01 CEST 2008 - dmueller@suse.de
 

rpmlint.spec

@@ -22,7 +22,7 @@ Name:           rpmlint
 BuildRequires:  rpm-python
 Summary:        Rpm correctness checker
 Version:        0.83
-Release:        29
+Release:        40
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        config
 Source1001:     config.in
@@ -102,6 +102,8 @@ Patch65:        suse-shlib-devel-dependency.diff
 Patch66:        suse-no-python-base.diff
 Patch67:        suse-required-lsb-tags.diff
 Patch68:        more-verbose-lsb-check.diff
+Patch69:        useless-requires-doc.diff
+Patch70:        subprocess-support.diff
 %py_requires
 
 %description
@@ -173,6 +175,8 @@ Authors:
 %patch66
 %patch67
 %patch68
+%patch69
+%patch70
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -192,7 +196,8 @@ make
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT/etc/bash_completion.d/rpmlint{,.sh}
+# the provided bash-completion does not work and only prints bash errors
+rm -rf  $RPM_BUILD_ROOT/etc/bash_completion.d
 mv $RPM_BUILD_ROOT/etc/rpmlint/config $RPM_BUILD_ROOT/usr/share/rpmlint/config
 head -n 8 $RPM_BUILD_ROOT/usr/share/rpmlint/config > $RPM_BUILD_ROOT/etc/rpmlint/config
 # make sure that the package is sane
@@ -208,10 +213,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/share/rpmlint
 %config(noreplace) /etc/rpmlint/config
 %dir /etc/rpmlint
-/etc/bash_completion.d/rpmlint.sh
 /usr/share/man/man1/rpmlint.1.gz
 
 %changelog
+* Wed Sep 03 2008 dmueller@suse.de
+- add description for useless-explicit-requires (bnc#405887)
 * Thu Aug 21 2008 dmueller@suse.de
 - rediff patch
 * Mon Aug 18 2008 schwab@suse.de

subprocess-support.diff

@@ -0,0 +1,52 @@
+--- Pkg.py
++++ Pkg.py
+@@ -13,13 +13,18 @@ import rpm
+ import os.path
+ import stat
+ import commands
+-import popen2
+ import re
+ import string
+ import tempfile
+ import types
+ import sys
+ 
++# popen2 is deprecated with 2.6 and newer
++if sys.version_info[0] > 2 or sys.version_info[1] >= 4:
++    import subprocess
++else:
++    import popen2
++
+ from Filter import printWarning
+ 
+ RPMFILE_CONFIG=(1 << 0)
+@@ -93,13 +98,23 @@ def substitute_shell_vars(val, script):
+ def getstatusoutput(cmd, stdoutonly=0):
+     '''A version of commands.getstatusoutput() which can take cmd as a
+        sequence, thus making it potentially more secure.  See popen2.'''
+-    if stdoutonly:
+-        proc = popen2.Popen3(cmd)
++    if sys.version_info[0] > 2 or sys.version_info[1] >= 4:
++        if stdoutonly:
++            proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, close_fds=True)
++        else:
++            proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
++
++        text = proc.stdout.read()
++        sts = proc.wait()
+     else:
+-        proc = popen2.Popen4(cmd)
+-    proc.tochild.close()
+-    text = proc.fromchild.read()
+-    sts = proc.wait()
++        if stdoutonly:
++            proc = popen2.Popen3(cmd)
++        else:
++            proc = popen2.Popen4(cmd)
++        proc.tochild.close()
++        text = proc.fromchild.read()
++        sts = proc.wait()
++
+     if sts is None: sts = 0
+     if text[-1:] == '\n': text = text[:-1]
+     return sts, text

useless-requires-doc.diff

@@ -0,0 +1,13 @@
+--- TagsCheck.py
++++ TagsCheck.py
+@@ -933,6 +933,10 @@ explicit Requires: tags.''',
+ '''This package provides 2 times the same capacity. It should only provide it
+ once.''',
+ 
++'useless-explicit-requires',
++'''This package requires 2 times the same capacity. It should only require it
++once.''',
++
+ 'unversioned-explicit-self-provides',
+ '''This package provides it's own name explicitely, which might break
+ upgrade path. self-provides are autogenerated. Remove the provide.''',