From 55598f9bff67c48a5d3c294c2bb8b8876094cabd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Fri, 5 Apr 2013 14:27:41 -0300 Subject: Pacman 4.1 --- libre/pacman/PKGBUILD | 52 ++++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 30 deletions(-) (limited to 'libre/pacman/PKGBUILD') diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 6f82bded2..db479c161 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -4,48 +4,38 @@ # Maintainer: Dave Reisner pkgname=pacman -pkgver=4.0.3 -pkgrel=7 +pkgver=4.1.0 +pkgrel=2 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" license=('GPL') groups=('base' 'base-devel') -depends=('bash' 'glibc>=2.15' 'libarchive>=3.1.2' 'curl>=7.19.4' +depends=('bash>=4.2.042-2' 'glibc>=2.17-2' 'libarchive>=3.1.2' 'curl>=7.19.4' 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-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.i686 pacman.conf.x86_64 pacman.conf.mips64el makepkg.conf) -md5sums=('387965c7125e60e5f0b9ff3b427fe0f9' - '1a70392526c8768470da678b31905a6e' - '1a9b79788640907a2b34e8671cacc94a' - 'a9ddd43891bed364e1e97d27b2887bf1' - '2e8cbf55a94b1954b167c5dee6b62317' - '4ce9e714919e632f48129985ea6b671f' - '43628d586f93d64354654ae3f51aab85' - 'f117e2e13f7d70629ce6923117c73881' - 'debc512689a1aa8c124fe0ccf27f5758') 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() { @@ -55,26 +45,26 @@ 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 mycarch="i686" mychost="i686-pc-linux-gnu" myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu" ;; 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 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu" ;; mips64el) - install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf mycarch="mips64el" mychost="mips64el-unknown-linux-gnu" myflags="-O2 -march=mips3 -mtune=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" @@ -88,12 +78,14 @@ package() { -e "s|@CHOST[@]|$mychost|g" \ -e "s|@LDFLAGS[@]|$myldflags|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 } -- cgit v1.2.3-2-g168b