diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-03 15:31:08 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-03 15:31:08 +0100 |
| commit | 86e7521993c095c2082316197d345c04dde46327 (patch) | |
| tree | c251bad878348dc28bfa14b9583964fc142deddf /libre/pacman | |
| parent | 6ca11940446fc579b8b58d05ea34843b13fe16f5 (diff) | |
| parent | 22e5f5bf64eba5c65674eeb3a8167de2854dbe0e (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
kde-unstable/calligra/PKGBUILD
multilib/lib32-udev/PKGBUILD
testing/emacs/PKGBUILD
Diffstat (limited to 'libre/pacman')
| -rw-r--r-- | libre/pacman/PKGBUILD | 5 | ||||
| -rw-r--r-- | libre/pacman/rePKGBUILD | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 0f0421867..e47ce7523 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,11 +1,11 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 145836 2012-01-02 19:39:43Z dreisner $ +# $Id: PKGBUILD 146568 2012-01-13 16:47:02Z dreisner $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Dave Reisner <dave@archlinux.org> pkgname=pacman pkgver=4.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -13,6 +13,7 @@ license=('GPL') groups=('base') depends=('bash' 'glibc' 'libarchive>=3.0.2' 'curl>=7.19.4' 'gpgme' 'pacman-mirrorlist') +makedepends=('asciidoc') optdepends=('fakeroot: for makepkg usage as normal user') backup=(etc/pacman.conf etc/makepkg.conf) install=pacman.install diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD index 3648f2a18..3967b90ab 100644 --- a/libre/pacman/rePKGBUILD +++ b/libre/pacman/rePKGBUILD @@ -2,7 +2,7 @@ source PKGBUILD CARCH=x86_64 unset build package md5sums source -_repo=testing +_repo=core source=(PKGBUILD ftp://ftp.archlinux.org/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT # files for pkg modifications |