pacman-parabola: add parabola suffix for the package

8 files changed, 10 insertions, 9 deletions

diff --git a/libre/pacman/PKGBUILD b/libre/pacman-parabola/PKGBUILD
index 774d45321..de3551045 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman-parabola/PKGBUILD
@@ -3,9 +3,10 @@
 # Maintainer (Arch): Dan McGee <dan@archlinux.org>
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
 
-pkgname=pacman
+_pkgname=pacman
+pkgname=pacman-parabola
 pkgver=4.1.2
-pkgrel=6.1
+pkgrel=6
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -15,12 +16,12 @@ 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')
 checkdepends=('python2' 'fakechroot')
 optdepends=('fakeroot: for makepkg usage as normal user')
-provides=('pacman-contrib')
-conflicts=('pacman-contrib')
-replaces=('pacman-contrib')
+provides=('pacman-contrib' "$_pkgname")
+conflicts=('pacman-contrib' "$_pkgname")
+replaces=('pacman-contrib' "$_pkgname=$pkgver")
 backup=(etc/pacman.conf etc/makepkg.conf)
 options=('strip' 'debug')
-source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+source=(ftp://ftp.archlinux.org/other/pacman/$_pkgname-$pkgver.tar.gz{,.sig}
         pacman.conf.i686
         pacman.conf.x86_64
         pacman.conf.mips64el
@@ -39,7 +40,7 @@ md5sums=('063c8b0ff6bdf903dc235445525627cd'
          '093f0779ac55ae781ba028ad74b95f84')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd "$_pkgname-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var --enable-doc \
@@ -50,11 +51,11 @@ build() {
 }
 
 check() {
-  make -C "$pkgname-$pkgver" check
+  make -C "$_pkgname-$pkgver" check
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd "$_pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" -C contrib install
diff --git a/libre/pacman/gpg.conf b/libre/pacman-parabola/gpg.conf
index 7fc6fc661..7fc6fc661 100644
--- a/libre/pacman/gpg.conf
+++ b/libre/pacman-parabola/gpg.conf
diff --git a/libre/pacman/makepkg.conf b/libre/pacman-parabola/makepkg.conf
index 758d7d029..758d7d029 100644
--- a/libre/pacman/makepkg.conf
+++ b/libre/pacman-parabola/makepkg.conf
diff --git a/libre/pacman/pacman.conf.i686 b/libre/pacman-parabola/pacman.conf.i686
index 84cec630c..84cec630c 100644
--- a/libre/pacman/pacman.conf.i686
+++ b/libre/pacman-parabola/pacman.conf.i686
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman-parabola/pacman.conf.mips64el
index 604040640..604040640 100644
--- a/libre/pacman/pacman.conf.mips64el
+++ b/libre/pacman-parabola/pacman.conf.mips64el
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman-parabola/pacman.conf.x86_64
index 03a8cf3a6..03a8cf3a6 100644
--- a/libre/pacman/pacman.conf.x86_64
+++ b/libre/pacman-parabola/pacman.conf.x86_64
diff --git a/libre/pacman/refresh-pacman-keys b/libre/pacman-parabola/refresh-pacman-keys
index e96dc34e5..e96dc34e5 100644
--- a/libre/pacman/refresh-pacman-keys
+++ b/libre/pacman-parabola/refresh-pacman-keys
diff --git a/libre/pacman/sks-keyservers.netCA.pem b/libre/pacman-parabola/sks-keyservers.netCA.pem
index 24a2ad2e8..24a2ad2e8 100644
--- a/libre/pacman/sks-keyservers.netCA.pem
+++ b/libre/pacman-parabola/sks-keyservers.netCA.pem