upgpkg: firefox-nightly-fr 60.0a1.20180123-1

Some tweaking to .desktop file as well

3 files changed, 17 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b818aab52c72..a51da61748a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-nightly-fr
 	pkgdesc = Standalone Web Browser from Mozilla — Nightly build (fr)
-	pkgver = 59.0a1.20171114
+	pkgver = 60.0a1.20180123
 	pkgrel = 1
 	url = https://www.mozilla.org/fr/firefox/nightly
 	arch = i686
@@ -25,17 +25,17 @@ pkgbase = firefox-nightly-fr
 	source = firefox-nightly.desktop
 	source = vendor.js
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha512sums = 25d59b6a64b3885bbc11361bdc3817150b1e168c759760c8521934a90df016272ec0946252dccdbb7e11c65932b27dc8d6f56e76be0aad5aa5e8ce1138f747ad
+	sha512sums = 12f795ea8ef1325c008f6442f9077cd1b269c8b32981873da49e658682fb853fa57d432f070b1414a420cb125b843269d61055fb56a811821d5756c8aa9c227a
 	sha512sums = bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010
-	source_i686 = 20171114-firefox-59.0a1.fr.linux-i686.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-59.0a1.fr.linux-i686.tar.bz2
-	source_i686 = 20171114-firefox-59.0a1.fr.linux-i686.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-59.0a1.fr.linux-i686.tar.bz2.asc
-	source_i686 = 20171114-firefox-59.0a1.fr.linux-i686.txt::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-59.0a1.en-US.linux-i686.txt
+	source_i686 = 20180123-firefox-60.0a1.fr.linux-i686.tar.bz2::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-60.0a1.fr.linux-i686.tar.bz2
+	source_i686 = 20180123-firefox-60.0a1.fr.linux-i686.tar.bz2.asc::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-60.0a1.fr.linux-i686.tar.bz2.asc
+	source_i686 = 20180123-firefox-60.0a1.fr.linux-i686.txt::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central/firefox-60.0a1.en-US.linux-i686.txt
 	sha512sums_i686 = SKIP
 	sha512sums_i686 = SKIP
 	sha512sums_i686 = SKIP
-	source_x86_64 = 20171114-firefox-59.0a1.fr.linux-x86_64.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-59.0a1.fr.linux-x86_64.tar.bz2
-	source_x86_64 = 20171114-firefox-59.0a1.fr.linux-x86_64.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-59.0a1.fr.linux-x86_64.tar.bz2.asc
-	source_x86_64 = 20171114-firefox-59.0a1.fr.linux-x86_64.txt::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-59.0a1.en-US.linux-x86_64.txt
+	source_x86_64 = 20180123-firefox-60.0a1.fr.linux-x86_64.tar.bz2::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-60.0a1.fr.linux-x86_64.tar.bz2
+	source_x86_64 = 20180123-firefox-60.0a1.fr.linux-x86_64.tar.bz2.asc::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-60.0a1.fr.linux-x86_64.tar.bz2.asc
+	source_x86_64 = 20180123-firefox-60.0a1.fr.linux-x86_64.txt::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central/firefox-60.0a1.en-US.linux-x86_64.txt
 	sha512sums_x86_64 = SKIP
 	sha512sums_x86_64 = SKIP
 	sha512sums_x86_64 = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 5092dfd7fa74..6c9cfd539e89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,8 @@ _pkgname=${_name}-${_channel}
 pkgname=${_pkgname}-${_lang}
 pkgdesc="Standalone Web Browser from Mozilla — Nightly build (${_lang})"
 url="https://www.mozilla.org/${_lang}/${_name}/${_channel}"
-_version=59.0a1
-pkgver=59.0a1.20171114
+_version=60.0a1
+pkgver=60.0a1.20180123
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -24,7 +24,7 @@ optdepends=('pulseaudio: audio support'
             'networkmanager: location detection via available WiFi networks'
             'speech-dispatcher: text-to-speech'
             'startup-notification: support for FreeDesktop Startup Notification')
-_url="https://ftp.mozilla.org/pub/${_name}/nightly/latest-mozilla-central"
+_url="https://download-installer.cdn.mozilla.net/pub/${_name}/nightly/latest-mozilla-central"
 _src="${_name}-${_version}.${_lang}.linux"
 _srcen="${_name}-${_version}.en-US.linux"
 _filename="$(date +%Y%m%d)-${_src}"
@@ -35,10 +35,8 @@ source_i686=("${_filename}-i686.tar.bz2"::"${_url}-l10n/${_src}-i686.tar.bz2"
 source_x86_64=("${_filename}-x86_64.tar.bz2"::"${_url}-l10n/${_src}-x86_64.tar.bz2"
                "${_filename}-x86_64.tar.bz2.asc"::"${_url}-l10n/${_src}-x86_64.tar.bz2.asc"
                "${_filename}-x86_64.txt"::"${_url}/${_srcen}-x86_64.txt")
-sha512sums=(
-    '25d59b6a64b3885bbc11361bdc3817150b1e168c759760c8521934a90df016272ec0946252dccdbb7e11c65932b27dc8d6f56e76be0aad5aa5e8ce1138f747ad'
-    'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010'
-)
+sha512sums=('12f795ea8ef1325c008f6442f9077cd1b269c8b32981873da49e658682fb853fa57d432f070b1414a420cb125b843269d61055fb56a811821d5756c8aa9c227a'
+            'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010')
 sha512sums_i686=('SKIP' 'SKIP' 'SKIP')
 sha512sums_x86_64=('SKIP' 'SKIP' 'SKIP')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla’s GnuPG release key
diff --git a/firefox-nightly.desktop b/firefox-nightly.desktop
index 2529b4c8a3e0..1a56ae6e45d0 100644
--- a/firefox-nightly.desktop
+++ b/firefox-nightly.desktop
@@ -5,13 +5,13 @@ GenericName=Web Browser
 GenericName[fr]=Navigateur web
 Comment=Browse the Web
 Comment[fr]=Naviguer sur le Web
-Exec=firefox-nightly --class=FirefoxNightly %u
+Exec=/opt/firefox-nightly/firefox-nightly %u
 Icon=firefox-nightly
 Terminal=false
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
 StartupNotify=true
-StartupWMClass=FirefoxNightly
+StartupWMClass=Nightly
 Categories=Network;WebBrowser;
 Keywords=web;browser;internet;
 Actions=new-window;new-private-window;
@@ -19,9 +19,9 @@ Actions=new-window;new-private-window;
 [Desktop Action new-window]
 Name=New Window
 Name[fr]=Nouvelle fenêtre
-Exec=firefox-nightly --class=FirefoxNightly --new-window %u
+Exec=/opt/firefox-nightly/firefox-nightly --new-window %u
 
 [Desktop Action new-private-window]
 Name=New Private Window
 Name[fr]=Nouvelle fenêtre de navigation privée
-Exec=firefox-nightly --class=FirefoxNightly --private-window %u
+Exec=/opt/firefox-nightly/firefox-nightly --private-window %u