netsurf-3.2-1.parabola1: updating version, remove libre suffix and add complex pkgrel

3 files changed, 21 insertions, 26 deletions

diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf/PKGBUILD
index 70ed26c7e..0a912302a 100644
--- a/libre/netsurf-libre/PKGBUILD
+++ b/libre/netsurf/PKGBUILD
@@ -1,33 +1,31 @@
-# $Id: PKGBUILD 117980 2014-08-27 19:40:10Z arodseth $
+# $Id: PKGBUILD 118143 2014-09-01 16:06:05Z arodseth $
 # Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
 # Contributor (Arch): Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor (Arch): Georgij Kondratjev <smpuj@bk.ru>
 # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=netsurf
-pkgname=netsurf-libre
-pkgver=3.1
-pkgrel=2
+pkgname=netsurf
+pkgver=3.2
+pkgrel=1.parabola1
 pkgdesc='Lightweight and fast web browser, without non-privacy search providers'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/'
 license=('MIT' 'GPL2')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
-depends=('libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.3.0' 'libdom>=0.1.0' 'gtk2') # gtk3
+replaces=(${pkgname}-libre)
+conflicts=(${pkgname}-libre)
+depends=('libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.4.0' 'libdom>=0.1.1' 'gtk2') # gtk3
 makedepends=('re2c' 'gendesk' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils')
-install="$_pkgname.install"
+install="$pkgname.install"
 source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
-        "http://download.$_pkgname-browser.org/$_pkgname/releases/source/$_pkgname-$pkgver-src.tar.gz"
+        "http://download.$pkgname-browser.org/$pkgname/releases/source/$pkgname-$pkgver-src.tar.gz"
         'netsurf.sh')
 sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
-            '1ef12b2e2bc68f9eff8465646b7359e3cb483e1042aed750cc283a70dd4c540c'
+            '04ffeb8335c59cbc23371b79ae3b178002e6e95c35225ef62db4b155ecc7e213'
             '70310682d1612457d7bb3096549110b6ec127f50e97853259fada6be0c52924b')
 
 prepare() {
-  cd "$_pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   # remove non-privacy search providers
   sed -i '\|Google|d
@@ -96,13 +94,13 @@ prepare() {
 
   cd ..
 
-  gendesk -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --exec 'netsurf %U' \
+  gendesk -f --pkgname "$pkgname" --pkgdesc "$pkgdesc" --exec 'netsurf %U' \
     --genericname 'Web Browser' --comment 'Lightweight web browser' \
     --mimetypes 'text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo'
 }
 
 build() {
-  make -C "$_pkgname-$pkgver" \
+  make -C "$pkgname-$pkgver" \
     PREFIX=/usr \
     TARGET=gtk \
     NETSURF_USE_WEBP=YES \
@@ -112,17 +110,14 @@ build() {
 }
 
 package() {
-  make -C "$_pkgname-$pkgver" install PREFIX=/usr DESTDIR="$pkgdir"
-  mv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname.elf"
-  install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
-  install -Dm644 "$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
-  install -Dm644 "$_pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$_pkgname.desktop"
-  install -Dm644 "$_pkgname-$pkgver/COPYING" \
-    "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
-  # use softlinks instead of hardlinks
-  rm -r "$pkgdir/usr/share/netsurf/C"
-  ln -s '/usr/share/netsurf/en' "$pkgdir/usr/share/netsurf/C"
+  make -C "$pkgname-$pkgver" install PREFIX=/usr DESTDIR="$pkgdir"
+  mv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/bin/$pkgname.elf"
+  install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 "$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "$pkgname-$pkgver/COPYING" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/netsurf-libre/netsurf.install b/libre/netsurf/netsurf.install
index ad97d7bab..ad97d7bab 100644
--- a/libre/netsurf-libre/netsurf.install
+++ b/libre/netsurf/netsurf.install
diff --git a/libre/netsurf-libre/netsurf.sh b/libre/netsurf/netsurf.sh
index 01ff68450..01ff68450 100644
--- a/libre/netsurf-libre/netsurf.sh
+++ b/libre/netsurf/netsurf.sh