Update to 48.0

4 files changed, 11 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 24eddab5a93a..fef7717a8dbf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Jul  7 18:24:00 UTC 2016
+# Tue Aug  2 10:01:22 UTC 2016
 pkgbase = firefox-eme-free-bin
 	pkgdesc = Standalone web browser from mozilla.org - EME free release
-	pkgver = 47.0.1
+	pkgver = 48.0
 	pkgrel = 1
 	url = http://www.mozilla.org/en-US/firefox/organizations/
 	install = firefox-eme-free.install
@@ -22,12 +22,10 @@ pkgbase = firefox-eme-free-bin
 	optdepends = gstreamer0.10: HTML5 video
 	optdepends = gstreamer0.10-good-plugins: h.264 video
 	provides = firefox-eme-free
-	source = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/47.0.1/linux-x86_64-EME-free/en-US/firefox-47.0.1.tar.bz2
+	source = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/48.0/linux-x86_64-EME-free/en-US/firefox-48.0.tar.bz2
 	source = firefox-eme-free.desktop
-	source = firefox-eme-free-safe.desktop
-	sha512sums = ca8677f447a507f836fe3646c58afc20f51b8abdab554e45bd6e5281b6c3f716868533d12f8f6289d414d94802bd355dccdfca4f4ac0b8152bb00b7bf6d2715d
-	sha512sums = ff7ecb22e93e3909da6a756c08a004795037cad8512d39d831a2afd758233d5b816db8d96fa3e02f672ea810d50add49d07d130ed17081a01d14899965288f54
-	sha512sums = c202303c3a7634f69e82b45ca7c4d8e14d08f35215aad69bf3cccd1cfcb9ba6ff548c6994058e83c121f83d0200efa597f381370a6efcebcd171ef0f8c8f73cc
+	sha512sums = 8ebd7d3395d156ad261e0e43a94b2c6f6f44bc29094a48b047888fd0c4257d0441ea5bc7e5700ea8b6120c5c395a5f4ee6f887e9eb6e5bf342321309b4b98030
+	sha512sums = faecc006b7c7d95d20430492530a598f4a69e71461833082ba6de68fe17d3b76e64f416fe0e00b06ded5e658c59a3e7b9c6fb24628a9944724d46e05545f1a18
 
 pkgname = firefox-eme-free-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index b64135b7567b..6f7a20ac6c75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=firefox-eme-free-bin
 _pkgname=${pkgname/-bin/}
-pkgver=47.0.1
+pkgver=48.0
 pkgrel=1
 pkgdesc='Standalone web browser from mozilla.org - EME free release'
 url='http://www.mozilla.org/en-US/firefox/organizations/'
@@ -17,13 +17,11 @@ optdepends=('libgnome: fixes file association/default browser issues on GNOME de
 provides=('firefox-eme-free')
 license=('MPL' 'GPL' 'LGPL')
 install=$_pkgname.install
-sha512sums=('ca8677f447a507f836fe3646c58afc20f51b8abdab554e45bd6e5281b6c3f716868533d12f8f6289d414d94802bd355dccdfca4f4ac0b8152bb00b7bf6d2715d'
-            'ff7ecb22e93e3909da6a756c08a004795037cad8512d39d831a2afd758233d5b816db8d96fa3e02f672ea810d50add49d07d130ed17081a01d14899965288f54'
-            'c202303c3a7634f69e82b45ca7c4d8e14d08f35215aad69bf3cccd1cfcb9ba6ff548c6994058e83c121f83d0200efa597f381370a6efcebcd171ef0f8c8f73cc')
+sha512sums=('8ebd7d3395d156ad261e0e43a94b2c6f6f44bc29094a48b047888fd0c4257d0441ea5bc7e5700ea8b6120c5c395a5f4ee6f887e9eb6e5bf342321309b4b98030'
+            'faecc006b7c7d95d20430492530a598f4a69e71461833082ba6de68fe17d3b76e64f416fe0e00b06ded5e658c59a3e7b9c6fb24628a9944724d46e05545f1a18')
 [[ "$CARCH" == "i686" ]] && sha512sums[0]='54f6cfc72d605666af0b96f1cacc5d91ca87dc861ffaa00a916077eca3103bf42e6556ac02e1482a5dbdb15739d69ee255b3a168fadbb0ba1d3cd2d70b1b4859'
 source=(http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/linux-x86_64-EME-free/en-US/firefox-${pkgver}.tar.bz2
-        $_pkgname.desktop 
-        $_pkgname-safe.desktop)
+        $_pkgname.desktop) 
 
 package() {
     cd $srcdir
@@ -32,6 +30,6 @@ package() {
     cp -r firefox/ $pkgdir/opt/$_pkgname
 
     ln -s /opt/$_pkgname/firefox $pkgdir/usr/bin/$_pkgname
-    install -m644 $srcdir/{$_pkgname.desktop,$_pkgname-safe.desktop} $pkgdir/usr/share/applications/
+    install -m644 $srcdir/$_pkgname.desktop $pkgdir/usr/share/applications/
     install -m644 $srcdir/firefox/browser/icons/mozicon128.png $pkgdir/usr/share/pixmaps/$_pkgname.png
 }
diff --git a/firefox-eme-free-safe.desktop b/firefox-eme-free-safe.desktop
deleted file mode 100644
index f9ac3252f645..000000000000
--- a/firefox-eme-free-safe.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Firefox EME free - Safe Mode
-GenericName=Web Browser - Safe Mode
-Icon=firefox-eme-free
-Type=Application
-Categories=Application;Network;
-MimeType=text/html
-Encoding=UTF-8
-Exec=/opt/firefox-eme-free/firefox -safe-mode %u
-Terminal=false
-MultipleArgs=false
-StartupNotify=false
-StartupWMClass=Firefox
diff --git a/firefox-eme-free.desktop b/firefox-eme-free.desktop
index e1a7fde837f4..90953766ba80 100644
--- a/firefox-eme-free.desktop
+++ b/firefox-eme-free.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Firefox EME free
-GenericName=Web Browser
+GenericName=Web Browser EME Free
 Icon=firefox-eme-free
 Type=Application
 Categories=Application;Network;