control: tags -1 + patch Ohai²,
On Sat, Oct 22, 2016 at 08:22:40PM +0200, Evgeni Golov wrote: > rpmlint ships files in /usr/share/bash_completion/completions/ > However, bash-completions actually go into > /usr/share/bash-completion/completions/ patch attached
>From 5ee483b22f15890cc96e49de01956333c2a25eb9 Mon Sep 17 00:00:00 2001 From: Evgeni Golov <[email protected]> Date: Sat, 22 Oct 2016 20:36:43 +0200 Subject: [PATCH] get path for bash-completions from pkg-config instead of patching the Makefile Closes: #841725 --- debian/control | 2 ++ debian/patches/bash_completion.patch | 22 ---------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 debian/patches/bash_completion.patch diff --git a/debian/control b/debian/control index 721d3bd..c3094de 100644 --- a/debian/control +++ b/debian/control @@ -4,12 +4,14 @@ Priority: extra Maintainer: RPM packaging team <[email protected]> Uploaders: Arturo Borrero Gonzalez <[email protected]> Build-Depends: binutils, + bash-completion, bzip2, cpio, debhelper (>= 9), dh-python, flake8, iso-codes, + pkg-config, python (<< 3), python-rpm (>= 4.4), rpm, diff --git a/debian/patches/bash_completion.patch b/debian/patches/bash_completion.patch deleted file mode 100644 index 05467a8..0000000 --- a/debian/patches/bash_completion.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -47,15 +47,10 @@ - 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 \ -- 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 -sf rpmlint $(DESTDIR)$$compdir/rpmdiff ; \ -- fi -+ mkdir -p $(DESTDIR)/usr/share/bash_completion/completions -+ cp -p rpmlint.bash-completion $(DESTDIR)/usr/share/bash_completion/completions/rpmlint -+ ln -sf rpmlint $(DESTDIR)/usr/share/bash_completion/completions/rpmdiff -+ - cp -p rpmdiff.1 rpmlint.1 $(DESTDIR)$(MANDIR)/man1 - - verify: diff --git a/debian/patches/series b/debian/patches/series index f67bab2..39a97b4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ path-for-autopkgtest.patch -bash_completion.patch -- 2.9.3
