vivaldi :: 2.0.1309.29-3

Signed-off-by: BlackEagle <ike.devolder@gmail.com>

3 files changed, 14 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e2d91f5ecc44..236e47ab529c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Sep 26 18:27:45 UTC 2018
+# Wed Sep 26 18:54:03 UTC 2018
 pkgbase = vivaldi
 	pkgdesc = An advanced browser made with the power user in mind.
 	pkgver = 2.0.1309.29
-	pkgrel = 2
+	pkgrel = 3
 	url = https://vivaldi.com
 	arch = x86_64
 	license = custom
@@ -24,8 +24,8 @@ pkgbase = vivaldi
 	optdepends = libnotify: native notifications
 	options = !strip
 	options = !zipman
-	source_x86_64 = https://downloads.vivaldi.com/stable/vivaldi-stable-2.0.1309.29-2.x86_64.rpm
-	sha512sums_x86_64 = 02917d8d23e0673b7faeb90c039179b6343b46983feb49963d7038104a63ee6c7ecde22ba9104fe86f00b82a476152808a176fda7d08574d17510871bc19abf5
+	source = https://downloads.vivaldi.com/stable/vivaldi-stable-2.0.1309.29-2.x86_64.rpm
+	sha512sums = 02917d8d23e0673b7faeb90c039179b6343b46983feb49963d7038104a63ee6c7ecde22ba9104fe86f00b82a476152808a176fda7d08574d17510871bc19abf5
 
 pkgname = vivaldi
 
diff --git a/.pkgupdate b/.pkgupdate
index 285337a4d9a3..56944634c072 100644
--- a/.pkgupdate
+++ b/.pkgupdate
@@ -1 +1,3 @@
-update_pkgver=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable-([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)-[0-9]+\.x86_64\.rpm.*/\1/p')
+packagesfile=$(curl -m 10 -s https://repo.vivaldi.com/stable/rpm/x86_64/repodata/repomd.xml | grep 'other.xml' | sed 's/.*\/\(.*other\.xml\.gz\).*/\1/')
+update__rpmversion=$(curl -m 10 -s https://repo.vivaldi.com/stable/rpm/x86_64/repodata/$packagesfile | zcat | grep -A1 '<package.*vivaldi-stable'| grep '<version' | sed -re 's/.*ver="([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)".*rel="([0-9]+)".*/\1-\2/' | sort -V | tail -n1)
+update_pkgver=${update__rpmversion/-*/}
diff --git a/PKGBUILD b/PKGBUILD
index f19716945777..8360ccb71298 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,9 @@
 # Contributor: TZ86
 
 pkgname=vivaldi
+_rpmversion=2.0.1309.29-2
 pkgver=2.0.1309.29
-pkgrel=2
+pkgrel=3
 pkgdesc='An advanced browser made with the power user in mind.'
 url="https://vivaldi.com"
 options=(!strip !zipman)
@@ -18,14 +19,14 @@ optdepends=(
     'vivaldi-widevine: Widevine DRM Plugin'
     'libnotify: native notifications'
 )
-source_x86_64=("https://downloads.vivaldi.com/stable/vivaldi-stable-${pkgver}-2.x86_64.rpm")
-sha512sums_x86_64=('02917d8d23e0673b7faeb90c039179b6343b46983feb49963d7038104a63ee6c7ecde22ba9104fe86f00b82a476152808a176fda7d08574d17510871bc19abf5')
+source=("https://downloads.vivaldi.com/stable/vivaldi-stable-${_rpmversion}.x86_64.rpm")
+sha512sums=('02917d8d23e0673b7faeb90c039179b6343b46983feb49963d7038104a63ee6c7ecde22ba9104fe86f00b82a476152808a176fda7d08574d17510871bc19abf5')
 
 package() {
     cp -a {opt,usr} "$pkgdir"
 
     # suid sandbox
-    chmod 4755 "$pkgdir/opt/vivaldi/vivaldi-sandbox"
+    chmod 4755 "$pkgdir/opt/$pkgname/vivaldi-sandbox"
 
     # make /usr/bin/vivaldi-stable available
     binf="$pkgdir/usr/bin/vivaldi-stable"
@@ -36,8 +37,8 @@ package() {
 
     # install icons
     for res in 16 22 24 32 48 64 128 256; do
-        install -Dm644 "$pkgdir/opt/vivaldi/product_logo_${res}.png" \
-            "$pkgdir/usr/share/icons/hicolor/${res}x${res}/apps/vivaldi.png"
+        install -Dm644 "$pkgdir/opt/$pkgname/product_logo_${res}.png" \
+            "$pkgdir/usr/share/icons/hicolor/${res}x${res}/apps/$pkgname.png"
     done
 
     # license