[arch-commits] Commit in netsurf/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Thursday, August 15, 2013 @ 14:59:19
  Author: arodseth
Revision: 95676

upgpkg: netsurf 3.0-3

Modified:
  netsurf/trunk/PKGBUILD

----------+
 PKGBUILD |   23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-15 12:50:15 UTC (rev 95675)
+++ PKGBUILD	2013-08-15 12:59:19 UTC (rev 95676)
@@ -6,11 +6,11 @@
 
 pkgname=netsurf
 pkgver=3.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight and fast web browser'
 arch=('x86_64' 'i686')
 url='http://www.netsurf-browser.org/'
-license=('GPL')
+license=('MIT' 'GPL2')
 depends=('gtk2' 'libmng' 'curl' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss' 'libwebp' 'libdom') # 'libharu' 'gstreamer0.10'
 makedepends=('js' 're2c' 'lcms' 'gendesk' 'netsurf-buildsystem' 'libglade')
 install="$pkgname.install"
@@ -19,15 +19,12 @@
 sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
             '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6')
 
-_exec=('netsurf %U')
-_genericname=('Web Browser')
-_comment=('Lightweight web browser')
-_mimetype=('text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo')
-
 prepare() {
-  cd "$srcdir"
+  cd "$pkgname-$pkgver"
 
-  gendesk
+  gendesk --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() {
@@ -46,12 +43,10 @@
   cd "$srcdir/$pkgname-$pkgver"
 
   make install PREFIX=/usr DESTDIR="$pkgdir"
-  install -Dm644 "../$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm644 "../$pkgname.desktop" \
+  install -Dm644 "../$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 "$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: