[pass] Fix bash completion
Christophe Fergeau
teuf at fedoraproject.org
Wed Apr 23 09:45:53 UTC 2014
commit d088931814c0e9ecf03100450ee2d93403f3562e
Author: Christophe Fergeau <cfergeau at redhat.com>
Date: Wed Apr 23 11:45:38 2014 +0200
Fix bash completion
...l-bash-completion-file-to-the-right-place.patch | 25 ++++++++++++++++++++
...tion-fix-completion-file-s-name-in-uninst.patch | 22 +++++++++++++++++
pass.spec | 11 +++++++-
3 files changed, 56 insertions(+), 2 deletions(-)
---
diff --git a/0001-Install-bash-completion-file-to-the-right-place.patch b/0001-Install-bash-completion-file-to-the-right-place.patch
new file mode 100644
index 0000000..d03ac2d
--- /dev/null
+++ b/0001-Install-bash-completion-file-to-the-right-place.patch
@@ -0,0 +1,25 @@
+From 542d5568578c8a603833d135b2d5caf5f29781b0 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason at zx2c4.com>
+Date: Mon, 14 Apr 2014 15:03:56 +0200
+Subject: [PATCH 1/2] Install bash-completion file to the right place.
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index ff9b450..df9d68a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,7 +15,7 @@ install-pass:
+ @mkdir -p "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/"
+ @install -m 0755 -v src/password-store.sh "$(DESTDIR)$(BINDIR)/pass"
+ @install -m 0644 -v man/pass.1 "$(DESTDIR)$(MANDIR)/man1/pass.1"
+- @install -m 0644 -v src/completion/pass.bash-completion "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/password-store"
++ @install -m 0644 -v src/completion/pass.bash-completion "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/pass"
+
+ # Uncomment to install the zsh completion file.
+ # @install -m 0644 -v src/completion/pass.zsh-completion "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/_pass"
+--
+1.9.0
+
diff --git a/0002-bash-completion-fix-completion-file-s-name-in-uninst.patch b/0002-bash-completion-fix-completion-file-s-name-in-uninst.patch
new file mode 100644
index 0000000..a95d016
--- /dev/null
+++ b/0002-bash-completion-fix-completion-file-s-name-in-uninst.patch
@@ -0,0 +1,22 @@
+From 775c305331a674ceb42c7a2e931e459a6b44b719 Mon Sep 17 00:00:00 2001
+From: schalox <schalox at gmail.com>
+Date: Sat, 19 Apr 2014 08:20:21 +0300
+Subject: [PATCH 2/2] bash-completion: fix completion-file's name in uninstall
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index df9d68a..f82b9cf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -33,4 +33,4 @@ install: install-pass
+ endif
+
+ uninstall:
+- @rm -vf "$(DESTDIR)$(BINDIR)/pass" "$(DESTDIR)$(MANDIR)/man1/pass.1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/password-store" "$(DESTDIR)$(LIBDIR)/password-store.platform.sh"
++ @rm -vf "$(DESTDIR)$(BINDIR)/pass" "$(DESTDIR)$(MANDIR)/man1/pass.1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/pass" "$(DESTDIR)$(LIBDIR)/password-store.platform.sh"
+--
+1.9.0
+
diff --git a/pass.spec b/pass.spec
index 8e54824..252b067 100644
--- a/pass.spec
+++ b/pass.spec
@@ -1,11 +1,13 @@
Name: pass
Summary: A password manager using standard Unix tools
Version: 1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Url: http://zx2c4.com/projects/password-store/
BuildArch: noarch
Source: http://git.zx2c4.com/password-store/snapshot/password-store-%{version}.tar.xz
+Patch1: 0001-Install-bash-completion-file-to-the-right-place.patch
+Patch2: 0002-bash-completion-fix-completion-file-s-name-in-uninst.patch
Requires: git
Requires: gnupg2
@@ -19,6 +21,8 @@ pwgen, and git.
%prep
%setup -q -n password-store-%{version}
+%patch1 -p1
+%patch2 -p1
%install
make DESTDIR=%{buildroot} PREFIX=%{_prefix} \
@@ -33,12 +37,15 @@ install -m 0644 src/completion/pass.fish-completion %{buildroot}%{_datadir}/fish
%files
%doc README COPYING contrib
%{_bindir}/pass
-%{_datadir}/bash-completion/completions/password-store
+%{_datadir}/bash-completion/completions/pass
%{_datadir}/fish/completions/pass.fish
%{_datadir}/zsh/site-functions/_pass
%doc %{_mandir}/man1/*
%changelog
+* Wed Apr 23 2014 Christophe Fergeau <cfergeau at redhat.com> 1.5-2
+- Fix location of bash completion files
+
* Thu Apr 17 2014 Christophe Fergeau <cfergeau at redhat.com> - 1.5-1
- Update to 1.5.0
More information about the scm-commits
mailing list