commit 6d06987bd90d3a76fbf2bb379845f81565319a54
Author: Elan Ruusamäe <[email protected]>
Date: Wed Jul 15 15:18:25 2015 +0300
up to 1.7
bash-completion.patch | 16 ++++++++--------
rpmlint-groups.patch | 18 +++++++++---------
rpmlint.spec | 4 ++--
3 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/rpmlint.spec b/rpmlint.spec
index 24c7978..376e2d4 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -4,12 +4,12 @@
Summary: Tool for checking common errors in RPM packages
Name: rpmlint
-Version: 1.6
+Version: 1.7
Release: 1
License: GPL v2
Group: Development/Building
Source0:
http://downloads.sourceforge.net/rpmlint/%{name}-%{version}.tar.xz
-# Source0-md5: ad09ff960c7f3561af59f7886f3619ef
+# Source0-md5: 0b78c2fa4a98c6f660003a679ad6ea90
Source1: %{name}.config
Source3: %{name}-etc.config
Patch0: %{name}-groups.patch
diff --git a/bash-completion.patch b/bash-completion.patch
index 90450ff..07395ca 100644
--- a/bash-completion.patch
+++ b/bash-completion.patch
@@ -1,5 +1,5 @@
---- rpmlint-1.6/Makefile~ 2014-07-19 16:05:09.000000000 +0300
-+++ rpmlint-1.6/Makefile 2014-09-18 15:36:35.380436188 +0300
+--- rpmlint-1.7/Makefile~ 2015-07-15 15:10:27.000000000 +0300
++++ rpmlint-1.7/Makefile 2015-07-15 15:12:32.665044829 +0300
@@ -10,6 +10,7 @@
LIBDIR=/usr/share/rpmlint
ETCDIR=/etc
@@ -8,9 +8,9 @@
FILES = rpmlint *.py INSTALL README README.devel COPYING tools/*.py \
Makefile config rpmdiff rpmdiff.1 rpmlint.bash-completion rpmlint.1 \
-@@ -41,14 +42,13 @@
- cp -p *.py *.pyo $(DESTDIR)$(LIBDIR)
- cp -p rpmlint rpmdiff $(DESTDIR)$(BINDIR)
+@@ -48,14 +48,13 @@
+ chmod +x $(DESTDIR)$(BINDIR)/$$file ; \
+ done
cp -p config $(DESTDIR)$(ETCDIR)/$(PACKAGE)
- compdir=`pkg-config --variable=completionsdir bash-completion
2>/dev/null` ; \
- if [ "x$$compdir" = "x" ] ; then \
@@ -20,10 +20,10 @@
else \
- mkdir -p $(DESTDIR)$$compdir ; \
- cp -p rpmlint.bash-completion $(DESTDIR)$$compdir/rpmlint ; \
-- ln -s rpmlint $(DESTDIR)$$compdir/rpmdiff ; \
-+ mkdir -p $(DESTDIR)$(bash_compdir); \
+- ln -sf rpmlint $(DESTDIR)$$compdir/rpmdiff ; \
++ mkdir -p $(DESTDIR)$(bash_compdir) ; \
+ cp -p rpmlint.bash-completion $(DESTDIR)$(bash_compdir)/rpmlint
; \
-+ ln -s rpmlint $(DESTDIR)$(bash_compdir)/rpmdiff ; \
++ ln -sf rpmlint $(DESTDIR)$(bash_compdir)/rpmdiff ; \
fi
cp -p rpmdiff.1 rpmlint.1 $(DESTDIR)$(MANDIR)/man1
diff --git a/rpmlint-groups.patch b/rpmlint-groups.patch
index a410e29..9a2cf79 100644
--- a/rpmlint-groups.patch
+++ b/rpmlint-groups.patch
@@ -1,11 +1,11 @@
---- rpmlint-1.0/Pkg.py~ 2010-06-05 22:55:53.000000000 +0300
-+++ rpmlint-1.0/Pkg.py 2011-01-09 18:37:55.913942986 +0200
-@@ -176,7 +176,7 @@
+--- rpmlint-1.7/Pkg.py~ 2015-07-08 16:38:24.000000000 +0300
++++ rpmlint-1.7/Pkg.py 2015-07-15 15:10:07.954186622 +0300
+@@ -197,7 +197,7 @@
+ the rpm package (if installed) if no filename is given"""
groups = []
if not filename:
- try:
-- p = InstalledPkg('rpm')
-+ p = InstalledPkg('rpmlint')
- except:
- pass
- else:
+- with InstalledPkg("rpm") as p:
++ with InstalledPkg("rpmlint") as p:
+ groupsfiles = [x for x in p.files() if x.endswith('/GROUPS')]
+ if groupsfiles:
+ filename = groupsfiles[0]
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpmlint.git/commitdiff/6d06987bd90d3a76fbf2bb379845f81565319a54
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
