Mailinglist Archive: opensuse-commit (1826 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package rpmlint
checked in at Fri Sep 26 15:19:48 CEST 2008.


--------
--- rpmlint/rpmlint.changes     2008-08-21 00:30:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/rpmlint/rpmlint.changes        2008-09-04 
02:43:43.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Sep  3 13:58:22 CEST 2008 - dmueller@xxxxxxx
+
+- add description for useless-explicit-requires (bnc#405887)
+
+-------------------------------------------------------------------



New:
----
  subprocess-support.diff
  useless-requires-doc.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rpmlint.spec ++++++
--- /var/tmp/diff_new_pack.v13211/_old  2008-09-26 15:17:42.000000000 +0200
+++ /var/tmp/diff_new_pack.v13211/_new  2008-09-26 15:17:42.000000000 +0200
@@ -22,7 +22,7 @@
 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 @@
 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 @@
 %patch66
 %patch67
 %patch68
+%patch69
+%patch70
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
@@ -192,7 +196,8 @@
 
 %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 @@
 %{_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@xxxxxxx
+- add description for useless-explicit-requires (bnc#405887)
 * Thu Aug 21 2008 dmueller@xxxxxxx
 - rediff patch
 * Mon Aug 18 2008 schwab@xxxxxxx














++++++ LibraryPolicyCheck.py ++++++
--- rpmlint/LibraryPolicyCheck.py       2008-07-25 04:49:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/rpmlint/LibraryPolicyCheck.py  2008-09-17 
00:41:13.000000000 +0200
@@ -38,7 +38,6 @@
         "libauthpgsql0",
         "libauthpipe0",
         "libauthuserdb0",
-        "libbluetooth2",
         "libcairo2",
         "libcairomm-1_0-1",
         "libcap1",

++++++ subprocess-support.diff ++++++
--- 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 ++++++
--- 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.''',

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx