[packages/rpmlint] - fix building without bash-completion-2 installed - don't package rpmdiff completion symlink - rel

[baggins]

commit 4fafb4fa735e21ab0c7a04e3ebd27de99d58fa38
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Sep 25 23:01:34 2012 +0200

    - fix building without bash-completion-2 installed
    - don't package rpmdiff completion symlink
    - rel 3

 bash-completion2.patch | 13 +++++++++++++
 rpmlint.spec           |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/rpmlint.spec b/rpmlint.spec
index b8dc17e..1531636 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:	2
+Release:	32
 License:	GPL v2
 Group:		Development/Building
 Source0:	http://rpmlint.zarb.org/download/%{name}-%{version}.tar.xz
@@ -17,6 +17,7 @@ Patch1:		pythonpath.patch
 Patch2:		%{name}-licenses.patch
 Patch3:		postshell.patch
 Patch4:		rpm5.patch
+Patch5:		bash-completion2.patch
 URL:		http://rpmlint.zarb.org/
 BuildRequires:	python >= 1.5.2
 BuildRequires:	python-modules
@@ -66,6 +67,7 @@ bash-completion for rpmlint.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 cp -p config config.example
 cp -p %{SOURCE3} config
@@ -127,5 +129,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/rpmdiff
 %{_datadir}/bash-completion/completions/rpmlint
diff --git a/bash-completion2.patch b/bash-completion2.patch
new file mode 100644
index 0000000..886d3c4
--- /dev/null
+++ b/bash-completion2.patch
@@ -0,0 +1,13 @@
+--- rpmlint-1.4/Makefile~	2011-12-04 17:23:10.000000000 +0100
++++ rpmlint-1.4/Makefile	2012-09-25 23:00:35.363182328 +0200
+@@ -46,8 +46,8 @@
+ 	cp -p config $(DESTDIR)$(ETCDIR)/$(PACKAGE)
+ 	compdir=`pkg-config --variable=completionsdir bash-completion 2>/dev/null` ; \
+ 	if [ "x$$compdir" = "x" ] ; then \
+-		mkdir -p $(DESTDIR)$(ETCDIR)/bash_completion.d ; \
+-		cp -p rpmlint.bash-completion $(DESTDIR)$(ETCDIR)/bash_completion.d/rpmlint ; \
++		mkdir -p $(DESTDIR)/usr/share/bash-completion/completions ; \
++		cp -p rpmlint.bash-completion $(DESTDIR)/usr/share/bash-completion/completions/rpmlint ; \
+ 	else \
+ 		mkdir -p $(DESTDIR)$$compdir ; \
+ 		cp -p rpmlint.bash-completion $(DESTDIR)$$compdir/rpmlint ; \
================================================================

---- gitweb:

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