20140415.191-1

- bash-completion file's name is fixed upstream, no need to patch it
- use redirediction to apply patch
- don't use args with patch

3 files changed, 10 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee64d55f0d4a..8532eec88840 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pass-git
 	pkgdesc = Stores, retrieves, generates, and synchronizes passwords securely
-	pkgver = 20140324.174
+	pkgver = 20140415.191
 	pkgrel = 1
 	url = http://zx2c4.com/projects/password-store/
 	arch = any
@@ -17,7 +17,7 @@ pkgbase = pass-git
 	source = pass-git::git://git.zx2c4.com/password-store
 	source = Makefile.patch
 	sha256sums = SKIP
-	sha256sums = ee81e78e0eabc9bfc04a1bbfec3e24872785503b59ee67e1d5900873c2d06324
+	sha256sums = 00d90c0406e881783491f1f160ce1ff7f1b856179f1af299f92fc919f7ec8ba7
 
 pkgname = pass-git
 
diff --git a/Makefile.patch b/Makefile.patch
index c0ebf6c655be..ce38c19866ee 100644
--- a/Makefile.patch
+++ b/Makefile.patch
@@ -1,6 +1,7 @@
-diff -up a/Makefile b/Makefile
---- a/Makefile	2014-04-03 10:36:12.920054098 -0400
-+++ b/Makefile	2014-04-03 10:37:49.056724095 -0400
+diff --git a/Makefile b/Makefile
+index df9d68a..7297d49 100644
+--- a/Makefile
++++ b/Makefile
 @@ -12,13 +12,13 @@ all:
  	@echo "Password store is a shell script, so there is nothing to do. Try \"make install\" instead."
  
@@ -9,8 +10,7 @@ diff -up a/Makefile b/Makefile
 +	@mkdir -p "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/" "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/"
  	@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"
+ 	@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"
diff --git a/PKGBUILD b/PKGBUILD
index 7a30d638adbd..aacc08abb9ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Simon Zimmermann <simon@insmo.com>
 
 pkgname=pass-git
-pkgver=20140324.174
+pkgver=20140415.191
 pkgrel=1
 pkgdesc='Stores, retrieves, generates, and synchronizes passwords securely'
 url='http://zx2c4.com/projects/password-store/'
@@ -15,7 +15,7 @@ conflicts=('pass')
 source=("$pkgname::git://git.zx2c4.com/password-store"
         'Makefile.patch')
 sha256sums=('SKIP'
-            'ee81e78e0eabc9bfc04a1bbfec3e24872785503b59ee67e1d5900873c2d06324')
+            '00d90c0406e881783491f1f160ce1ff7f1b856179f1af299f92fc919f7ec8ba7')
 
 pkgver() {
     cd "$pkgname"
@@ -25,7 +25,7 @@ pkgver() {
 }
 prepare() {
     cd "$pkgname"
-    patch -Np1 -i "${srcdir}/Makefile.patch"
+    patch < "${srcdir}/Makefile.patch"
 }
 package() {
     cd "$pkgname"