From f23dfdc81b1c993520a9ab7cc12263efa31cd9bc Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 5 Sep 2014 03:51:26 -0300 Subject: rename cacert-dot-org to ca-certificates-cacert and keep it on [libre] temporally because there is a Arch official package but on [testing] only, add cacert-dot-org in conflicts and replaces array of pacman package to begin use ca-certificates-cacert --- libre/pacman/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre/pacman') diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index be9d693ea..9c08c530a 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -6,20 +6,20 @@ pkgname=pacman pkgver=4.1.2 -pkgrel=6.1.parabola1 +pkgrel=6.1.parabola2 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>=4.2.042-2' 'glibc>=2.17-2' 'libarchive>=3.1.2' 'curl>=7.19.4' - 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring' 'cacert-dot-org') + 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring' 'ca-certificates-cacert') makedepends=('asciidoc') # build man pages checkdepends=('python2' 'fakechroot') optdepends=('fakeroot: for makepkg usage as normal user') provides=("$pkgname-contrib") -conflicts=("$pkgname-contrib" "$pkgname-parabola") -replaces=("$pkgname-contrib" "$pkgname-parabola") +conflicts=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org') +replaces=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org') backup=('etc/pacman.conf' 'etc/makepkg.conf') options=('strip' 'debug') source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} -- cgit v1.2.3