[packages/rpmlint] - rpm5 doesn't have _RPMVSF_NOSIGNATURES - compat patch not needed - updated bash-completion locatio

[baggins]

commit 88c94542d8fda46034bbc9997039b716c35659fe
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Sep 25 22:47:07 2012 +0200

    - rpm5 doesn't have _RPMVSF_NOSIGNATURES
    - compat patch not needed
    - updated bash-completion locations
    - rel 2

 rpm-compat.patch | 26 --------------------------
 rpm5.patch       | 11 +++++++++++
 rpmlint.spec     |  9 +++++----
 3 files changed, 16 insertions(+), 30 deletions(-)
---
diff --git a/rpmlint.spec b/rpmlint.spec
index de2fb73..19aa765 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -5,7 +5,7 @@
 Summary:	Tool for checking common errors in RPM packages
 Name:		rpmlint
 Version:	1.4
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Development/Building
 Source0:	http://rpmlint.zarb.org/download/%{name}-%{version}.tar.xz
@@ -15,8 +15,8 @@ Source3:	%{name}-etc.config
 Patch0:		%{name}-groups.patch
 Patch1:		pythonpath.patch
 Patch2:		%{name}-licenses.patch
-Patch3:		rpm-compat.patch
-Patch4:		postshell.patch
+Patch3:		postshell.patch
+Patch4:		rpm5.patch
 URL:		http://rpmlint.zarb.org/
 BuildRequires:	python >= 1.5.2
 BuildRequires:	python-modules
@@ -127,4 +127,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)
-/etc/bash_completion.d/rpmlint
+%{_datadir}/bash-completion/completions/rpmdiff
+%{_datadir}/bash-completion/completions/rpmlint
diff --git a/rpm-compat.patch b/rpm-compat.patch
deleted file mode 100644
index cc3b06b..0000000
--- a/rpm-compat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- rpmlint-1.0/DocFilesCheck.py~	2010-05-19 17:54:28.000000000 +0300
-+++ rpmlint-1.0/DocFilesCheck.py	2011-01-09 18:57:11.207990792 +0200
-@@ -40,7 +40,7 @@
- 
-         for dep in pkg.header.dsFromHeader():
-             # skip deps which were found by find-requires
--            if dep.Flags() & rpm.RPMSENSE_FIND_REQUIRES != 0:
-+            if dep.Flags(): # & rpm.RPMSENSE_FIND_REQUIRES != 0:
-                 continue
-             core_reqs[dep.N()] = []
- 
---- rpmlint-1.0/Pkg.py~	2011-01-09 18:52:55.477166839 +0200
-+++ rpmlint-1.0/Pkg.py	2011-01-09 18:55:25.437670292 +0200
-@@ -42,11 +42,7 @@
- 
- # 64: RPMSENSE_PREREQ is 0 with recent rpm versions, we want 64 here in order
- # to do the right thing with packages built with older rpm versions
--PREREQ_FLAG = (rpm.RPMSENSE_PREREQ or 64) | \
--              rpm.RPMSENSE_SCRIPT_PRE | \
--              rpm.RPMSENSE_SCRIPT_POST | \
--              rpm.RPMSENSE_SCRIPT_PREUN | \
--              rpm.RPMSENSE_SCRIPT_POSTUN
-+PREREQ_FLAG = (rpm.RPMSENSE_PREREQ or 64)
- 
- var_regex = re.compile('^(.*)\${?(\w+)}?(.*)$')
- 
diff --git a/rpm5.patch b/rpm5.patch
new file mode 100644
index 0000000..513d259
--- /dev/null
+++ b/rpm5.patch
@@ -0,0 +1,11 @@
+--- rpmlint-1.4/Pkg.py~	2012-09-25 22:39:39.673226624 +0200
++++ rpmlint-1.4/Pkg.py	2012-09-25 22:40:12.223225476 +0200
+@@ -434,8 +434,6 @@
+         else:
+             # Create a package object from the file name
+             ts = rpm.TransactionSet()
+-            # Don't check signatures here...
+-            ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
+             fd = os.open(filename, os.O_RDONLY)
+             try:
+                 self.header = ts.hdrFromFdno(fd)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpmlint.git/commitdiff/f1e83b32d70a6bf60573e076c819d5e3302048c7