libre/pacman-4.0.3-3

recovered rePKGBUILD

1 files changed, 23 insertions, 16 deletions

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index d8d3a6d26..94f5453b5 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -4,38 +4,34 @@
 # Maintainer: Dave Reisner <dave@archlinux.org>
 
 pkgname=pacman
-pkgver=4.0.2
-pkgrel=1
+pkgver=4.0.3
+pkgrel=3
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
 groups=('base')
 depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4'
-         'gpgme' 'pacman-mirrorlist')
+         'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')
 optdepends=('fakeroot: for makepkg usage as normal user')
 backup=(etc/pacman.conf etc/makepkg.conf)
 install=pacman.install
 options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+        0001-Add-conflict-for-replacing-owned-empty-directory.patch
+        0002-Check-empty-subdirectory-ownership.patch
         pacman.conf
         pacman.conf.x86_64
         pacman.conf.mips64el
         makepkg.conf)
-md5sums=('289ba4a19a16393096e065cec1cb9b0a'
-         '575140dce3ea597d91b6d081aa3f6a00'
-         '858d1ffb284afc6b15f72578ba3cac50'
-         '7dade0c0a4d597c480d779afa4f5097c'
-         'd4ca1a1d8e6708c0302a225628a489eb'
-         'debc512689a1aa8c124fe0ccf27f5758')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
+  patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
+  patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
+
   ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var --enable-doc
   make
@@ -83,8 +79,19 @@ package() {
     -e "s|@CARCHFLAGS[@]|$myflags|g"
 
   # install completion files
-  mkdir -p $pkgdir/etc/bash_completion.d/
-  install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman
-  mkdir -p $pkgdir/usr/share/zsh/site-functions/
-  install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
+  install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman"
+  for f in makepkg pacman-key; do
+    ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
+  done
+
+  install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
 }
+
+md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
+         '1a70392526c8768470da678b31905a6e'
+         '1a9b79788640907a2b34e8671cacc94a'
+         'a9ddd43891bed364e1e97d27b2887bf1'
+         '080d9f76f56e135cc62205874636aa0f'
+         'ce9943fc8086d491890565e91ea1a0d8'
+         'eb8dba9bd0b315230fbf0e5dc0a7335b'
+         'debc512689a1aa8c124fe0ccf27f5758')