xarchiver: remove libre suffix and add complex pkgrel

7 files changed, 7 insertions, 9 deletions

diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver/PKGBUILD
index a6965af8d..35728b96a 100644
--- a/libre/xarchiver-libre/PKGBUILD
+++ b/libre/xarchiver/PKGBUILD
@@ -4,17 +4,15 @@
 # Contributor (Arch): Andrew Simmons <andrew.simmons@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=xarchiver
-pkgname=xarchiver-libre
+pkgname=xarchiver
 pkgver=0.5.3
-pkgrel=4.1
+pkgrel=4.parabola1
 pkgdesc="GTK+ frontend to various command line archivers, without nonfree unrar support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xarchiver.sourceforge.net/"
 license=('GPL')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
+conflicts=("${pkgname}-libre")
+replaces=("${pkgname}-libre")
 depends=('gtk2' 'desktop-file-utils')
 makedepends=('intltool')
 optdepends=('zip: ZIP support'
@@ -38,7 +36,7 @@ md5sums=('fd390bbd2df76a5f8a007bdeae82d4aa'
          'cf1788c180145adc3bc5d3572f8a883b')
 
 prepare() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   # Fix RPM support
   patch -Np1 -i ../xarchiver-0.5.3-fix-rpm-support.patch
@@ -65,12 +63,12 @@ prepare() {
 }
 
 build() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4
   make
 }
 
 package() {
-  cd $_pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch b/libre/xarchiver/xarchiver-0.5.3-add-mime-types.patch
index ec427b99a..ec427b99a 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch
+++ b/libre/xarchiver/xarchiver-0.5.3-add-mime-types.patch
diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-fix-double-escaping.patch b/libre/xarchiver/xarchiver-0.5.3-fix-double-escaping.patch
index 8b44d91a0..8b44d91a0 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.3-fix-double-escaping.patch
+++ b/libre/xarchiver/xarchiver-0.5.3-fix-double-escaping.patch
diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch b/libre/xarchiver/xarchiver-0.5.3-fix-password-protected.patch
index 00969349d..00969349d 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch
+++ b/libre/xarchiver/xarchiver-0.5.3-fix-password-protected.patch
diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-fix-rpm-support.patch b/libre/xarchiver/xarchiver-0.5.3-fix-rpm-support.patch
index cf17ff738..cf17ff738 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.3-fix-rpm-support.patch
+++ b/libre/xarchiver/xarchiver-0.5.3-fix-rpm-support.patch
diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-remove-nonfree-unrar-support.patch b/libre/xarchiver/xarchiver-0.5.3-remove-nonfree-unrar-support.patch
index e8ba41d59..e8ba41d59 100644
--- a/libre/xarchiver-libre/xarchiver-0.5.3-remove-nonfree-unrar-support.patch
+++ b/libre/xarchiver/xarchiver-0.5.3-remove-nonfree-unrar-support.patch
diff --git a/libre/xarchiver-libre/xarchiver.install b/libre/xarchiver/xarchiver.install
index c317fbaca..c317fbaca 100644
--- a/libre/xarchiver-libre/xarchiver.install
+++ b/libre/xarchiver/xarchiver.install