qupzilla: remove libre suffix and add complex pkgrel

5 files changed, 20 insertions, 21 deletions

diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla/PKGBUILD
index b26cbfcc9..fd7c14ac0 100644
--- a/libre/qupzilla-libre/PKGBUILD
+++ b/libre/qupzilla/PKGBUILD
@@ -2,22 +2,21 @@
 # Maintainer (Arch): speps <speps at aur dot archlinux dot org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgbase=qupzilla
-pkgbase=qupzilla-libre
-pkgname=(qupzilla-libre qupzilla-libre-qt4)
+pkgbase=qupzilla
+pkgname=(qupzilla qupzilla-qt4)
 pkgver=1.6.6
-pkgrel=1
+pkgrel=1.parabola1
 arch=(i686 x86_64 mips64el)
 url="http://www.qupzilla.com/"
 license=('GPL3')
 makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell' 'kdelibs' 'libgnome-keyring')
 optdepends=('bash-completion: bash completion support')
-install="$_pkgbase.install"
-source=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v$pkgver.tar.gz"
+install="$pkgbase.install"
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v$pkgver.tar.gz"
          'searchenginesmanager.cpp.sed'
          'speeddial.cpp.sed'
          'start.html.sed')
-noextract=("$_pkgbase-$pkgver.tar.gz")
+noextract=("$pkgbase-$pkgver.tar.gz")
 md5sums=('daad78e47a0956dcc99c0cba9ae6e462'
          '1d926e97a5b287d40fb695f6516f2a06'
          '0f166fa102af975b3b8ac030d477e9b8'
@@ -26,8 +25,8 @@ md5sums=('daad78e47a0956dcc99c0cba9ae6e462'
 prepare() {
   # extract
   mkdir -p qt{4,5}
-  bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt4
-  bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt5
+  bsdtar --strip-components 1 -zxf $pkgbase-$pkgver.tar.gz -C qt4
+  bsdtar --strip-components 1 -zxf $pkgbase-$pkgver.tar.gz -C qt5
 
   # configure
   export USE_WEBGL=true \
@@ -57,37 +56,37 @@ build() {
   make
 }
 
-package_qupzilla-libre() {
+package_qupzilla() {
   pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search providers"
   depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme')
   optdepends=('libgnome-keyring: gnome keyring integration')
-  provides=('qupzilla-qt5' "qupzilla=$pkgver")
-  conflicts=('qupzilla-qt5' 'qupzilla')
-  replaces=('qupzilla-qt5' 'qupzilla')
+  provides=('qupzilla-qt5')
+  conflicts=('qupzilla-qt5' 'qupzilla-libre')
+  replaces=('qupzilla-qt5' 'qupzilla-libre')
 
   cd qt5
   make INSTALL_ROOT="$pkgdir/" install
 
   # zsh completion
-  install -Dm644 linux/completion/_$_pkgbase \
-    "$pkgdir/usr/share/zsh/site-functions/_$_pkgbase"
+  install -Dm644 linux/completion/_$pkgbase \
+    "$pkgdir/usr/share/zsh/site-functions/_$pkgbase"
 }
 
-package_qupzilla-libre-qt4() {
+package_qupzilla-qt4() {
   pkgdesc="Cross-platform QtWebKit browser (Qt4), without non-privacy search providers"
   depends=('qtwebkit' 'hunspell')
   optdepends=('kdelibs: kwallet integration'
               'libgnome-keyring: gnome keyring integration')
-  provides=('qupzilla-libre' "qupzilla-qt4=$pkgver")
-  conflicts=('qupzilla-libre' 'qupzilla-qt4')
-  replaces=('qupzilla-qt4')
+  provides=('qupzilla')
+  conflicts=('qupzilla' 'qupzilla-libre-qt4')
+  replaces=('qupzilla-libre-qt4')
 
   cd qt4
   make INSTALL_ROOT="$pkgdir/" install
 
   # zsh completion
-  install -Dm644 linux/completion/_$_pkgbase \
-    "$pkgdir/usr/share/zsh/site-functions/_$_pkgbase"
+  install -Dm644 linux/completion/_$pkgbase \
+    "$pkgdir/usr/share/zsh/site-functions/_$pkgbase"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/qupzilla-libre/qupzilla.install b/libre/qupzilla/qupzilla.install
index 029294d67..029294d67 100644
--- a/libre/qupzilla-libre/qupzilla.install
+++ b/libre/qupzilla/qupzilla.install
diff --git a/libre/qupzilla-libre/searchenginesmanager.cpp.sed b/libre/qupzilla/searchenginesmanager.cpp.sed
index 76011d058..76011d058 100644
--- a/libre/qupzilla-libre/searchenginesmanager.cpp.sed
+++ b/libre/qupzilla/searchenginesmanager.cpp.sed
diff --git a/libre/qupzilla-libre/speeddial.cpp.sed b/libre/qupzilla/speeddial.cpp.sed
index b8f591e87..b8f591e87 100644
--- a/libre/qupzilla-libre/speeddial.cpp.sed
+++ b/libre/qupzilla/speeddial.cpp.sed
diff --git a/libre/qupzilla-libre/start.html.sed b/libre/qupzilla/start.html.sed
index f59a65979..f59a65979 100644
--- a/libre/qupzilla-libre/start.html.sed
+++ b/libre/qupzilla/start.html.sed