[packages/rpmlint] - don't force bash-completion 2, rpmlint wants 1 - allow proper build without bash-completion instal

[baggins]

commit 1f50ca435a36b9973b09f776d89c19fadfd46060
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Sep 26 10:44:52 2012 +0200

    - don't force bash-completion 2, rpmlint wants 1
    - allow proper build without bash-completion installed
    - proper rel 4

 bash-completion.patch  | 20 ++++++++++++++++++++
 bash-completion2.patch | 13 -------------
 rpmlint.spec           |  6 +++---
 3 files changed, 23 insertions(+), 16 deletions(-)
---
diff --git a/rpmlint.spec b/rpmlint.spec
index 1531636..76dcfa0 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:	32
+Release:	4
 License:	GPL v2
 Group:		Development/Building
 Source0:	http://rpmlint.zarb.org/download/%{name}-%{version}.tar.xz
@@ -17,7 +17,7 @@ Patch1:		pythonpath.patch
 Patch2:		%{name}-licenses.patch
 Patch3:		postshell.patch
 Patch4:		rpm5.patch
-Patch5:		bash-completion2.patch
+Patch5:		bash-completion.patch
 URL:		http://rpmlint.zarb.org/
 BuildRequires:	python >= 1.5.2
 BuildRequires:	python-modules
@@ -129,4 +129,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/rpmlint
+/etc/bash_completion.d/rpmlint
diff --git a/bash-completion.patch b/bash-completion.patch
new file mode 100644
index 0000000..c3bd724
--- /dev/null
+++ b/bash-completion.patch
@@ -0,0 +1,20 @@
+--- rpmlint-1.4/Makefile~	2011-12-04 17:23:10.000000000 +0100
++++ rpmlint-1.4/Makefile	2012-09-26 10:42:17.091754067 +0200
+@@ -44,15 +44,8 @@
+ 	cp -p *.py *.pyo $(DESTDIR)$(LIBDIR)
+ 	cp -p rpmlint rpmdiff $(DESTDIR)$(BINDIR)
+ 	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 ; \
+-	else \
+-		mkdir -p $(DESTDIR)$$compdir ; \
+-		cp -p rpmlint.bash-completion $(DESTDIR)$$compdir/rpmlint ; \
+-		ln -s rpmlint $(DESTDIR)$$compdir/rpmdiff ; \
+-	fi
++	mkdir -p $(DESTDIR)$(ETCDIR)/bash_completion.d ; \
++	cp -p rpmlint.bash-completion $(DESTDIR)$(ETCDIR)/bash_completion.d/rpmlint ; \
+ 	cp -p rpmlint.1 $(DESTDIR)$(MANDIR)/man1/rpmlint.1
+ 
+ verify:
diff --git a/bash-completion2.patch b/bash-completion2.patch
deleted file mode 100644
index 886d3c4..0000000
--- a/bash-completion2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/1f50ca435a36b9973b09f776d89c19fadfd46060