pacman: update to 4.1.2

1 files changed, 28 insertions, 31 deletions

diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD
index 6ee826d..bc88ebb 100644
--- a/abs/core/pacman/PKGBUILD
+++ b/abs/core/pacman/PKGBUILD
@@ -1,49 +1,39 @@
 # vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 171528 2012-11-18 11:37:56Z allan $
+# $Id$
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pacman
-pkgver=4.0.3
-pkgrel=5
+pkgver=4.1.2
+pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
-groups=('base')
-depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4'
+groups=('base' 'base-devel')
+depends=('bash>=4.2.042-2' 'glibc>=2.16' 'libarchive>=3.1.2' 'curl>=7.19.4'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
-makedepends=('asciidoc')
+#checkdepends=('python2' 'fakechroot')
 optdepends=('fakeroot: for makepkg usage as normal user')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
 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
-        0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
-        pacman.conf
         pacman.conf.x86_64
         makepkg.conf)
-md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
-         '1a70392526c8768470da678b31905a6e'
-         '1a9b79788640907a2b34e8671cacc94a'
-         'a9ddd43891bed364e1e97d27b2887bf1'
-         '2e8cbf55a94b1954b167c5dee6b62317'
-         '99734ea46795f466d41c503e9e23b6d4'
-         '556d49489e82b5750cf026d3b18c8f4f'
-         '589cd34eb9d5b678455e8289394f523e')
 
 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
-  patch -p1 -i $srcdir/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
-
   ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var --enable-doc
+    --localstatedir=/var --enable-doc \
+    --with-scriptlet-shell=/usr/bin/bash \
+    --with-ldconfig=/usr/bin/ldconfig
   make
+  make -C contrib
 }
 
 check() {
@@ -53,18 +43,19 @@ check() {
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir -C contrib install
 
   # install Arch specific stuff
-  mkdir -p $pkgdir/etc
+  install -dm755 $pkgdir/etc
+  install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
+  
   case "$CARCH" in
-    i686)
-      install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+    i686)    
       mycarch="i686"
       mychost="i686-pc-linux-gnu"
       myflags="-march=i686"
       ;;
     x86_64)
-      install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
       mycarch="x86_64"
       mychost="x86_64-unknown-linux-gnu"
       myflags="-march=x86-64"
@@ -76,12 +67,18 @@ package() {
     -e "s|@CARCH[@]|$mycarch|g" \
     -e "s|@CHOST[@]|$mychost|g" \
     -e "s|@CARCHFLAGS[@]|$myflags|g"
+    
+  # put bash_completion in the right location
+  install -dm755 ${pkgdir}/usr/share/bash-completion/completions
+  mv ${pkgdir}/etc/bash_completion.d/pacman \
+    ${pkgdir}/usr/share/bash-completion/completions
+  rmdir ${pkgdir}/etc/bash_completion.d
 
-  # install completion files
-  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=('063c8b0ff6bdf903dc235445525627cd'
+         '7e46c2654b016fc1de45499a537cb990'
+         'de74a13618347f08ae4a9637f74471c4'
+         '5f360e003e95f1a5cbd6e60d937dfd25')