midori{,-gtk3}: remove libre suffix and add complex pkgrel

4 files changed, 11 insertions, 14 deletions

diff --git a/libre/midori-libre-gtk3/PKGBUILD b/libre/midori-gtk3/PKGBUILD
index 938454573..e4bac6b96 100644
--- a/libre/midori-libre-gtk3/PKGBUILD
+++ b/libre/midori-gtk3/PKGBUILD
@@ -7,18 +7,17 @@
 # Contributor (Arch): Bartłomiej Piotrowski <barthalion@gmail.com>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=midori-gtk3
-pkgname=midori-libre-gtk3
+pkgname=midori-gtk3
 pkgver=0.5.8
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc='Lightweight web browser (GTK3), without non-privacy search providers'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.midori-browser.org/'
 license=('LGPL2.1')
 install='midori.install'
-replaces=("$_pkgname" "$_pkgname-libre")
-conflicts=('midori-libre' "$_pkgname"  "$_pkgname-libre")
-provides=('midori-libre' "$_pkgname=$pkgver" "$_pkgname-libre")
+replaces=('midori-gtk3-libre' 'midori-libre-gtk3')
+conflicts=('midori' 'midori-gtk3-libre' 'midori-libre-gtk3')
+provides=('midori')
 depends=('libzeitgeist' 'webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr')
 makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake')
 optdepends=('gst-plugins-base: HTML5 OGG videos support'
@@ -27,7 +26,7 @@ optdepends=('gst-plugins-base: HTML5 OGG videos support'
             'aria2: download utility')
 options=('!emptydirs')
 # options=('!emptydirs' '!strip')  # useful for debbuging see: https://labs.parabola.nu/issues/515
-source=("http://www.midori-browser.org/downloads/${_pkgname/-gtk3}_${pkgver}_all_.tar.bz2")
+source=("http://www.midori-browser.org/downloads/${pkgname/-gtk3}_${pkgver}_all_.tar.bz2")
 sha256sums=('af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381')
 
 prepare() {
diff --git a/libre/midori-libre-gtk3/midori.install b/libre/midori-gtk3/midori.install
index e6af79c5f..e6af79c5f 100644
--- a/libre/midori-libre-gtk3/midori.install
+++ b/libre/midori-gtk3/midori.install
diff --git a/libre/midori-libre/PKGBUILD b/libre/midori/PKGBUILD
index 9dd09b6dc..e91a69716 100644
--- a/libre/midori-libre/PKGBUILD
+++ b/libre/midori/PKGBUILD
@@ -6,23 +6,21 @@
 # Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=midori
-pkgname=midori-libre
+pkgname=midori
 pkgver=0.5.8
-pkgrel=1
+pkgrel=1.parabola1
 pkgdesc='Lightweight web browser (GTK2), without non-privacy search providers'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
 license=('LGPL2.1')
 install='midori.install'
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-libre)
+conflicts=(${pkgname}-libre)
 depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique')
 makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake')
 optdepends=('aria2: download utility')
 options=('!emptydirs')
-source=("http://www.midori-browser.org/downloads/${_pkgname}_${pkgver}_all_.tar.bz2")
+source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2")
 sha256sums=('af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381')
 
 prepare() {
diff --git a/libre/midori-libre/midori.install b/libre/midori/midori.install
index e6af79c5f..e6af79c5f 100644
--- a/libre/midori-libre/midori.install
+++ b/libre/midori/midori.install