# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1426953312 -3600
# Node ID 6fabac5939cbcf4ea48dfa454bc8a111fef3eabf
# Parent  d560fce2b8a3e8b8f74f2674b2fc932206d9d258
36.0.4

diff -r d560fce2b8a3 -r 6fabac5939cb MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Sun Mar 08 13:28:55 2015 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Sat Mar 21 16:55:12 2015 +0100
@@ -1,4 +1,23 @@
 -------------------------------------------------------------------
+Sat Mar 21 09:03:12 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 36.0.4 (bnc#923495)
+  * MFSA 2015-28/CVE-2015-0818 (bmo#1144988)
+    Privilege escalation through SVG navigation
+  * MFSA 2015-29/CVE-2015-0817 (bmo#1145255)
+    Code execution through incorrect JavaScript bounds checking
+    elimination
+
+-------------------------------------------------------------------
+Fri Mar 20 15:02:33 UTC 2015 - dimstar@opensuse.org
+
+- Copy the icons to /usr/share/icons instead of symlinking them:
+  in preparation for containerized apps (e.g. xdg-app) as well as
+  AppStream metadata extraction, there are a couple locations that
+  need to be real files for system integration (.desktop files,
+  icons, mime-type info).
+
+-------------------------------------------------------------------
 Sat Mar  7 07:40:56 UTC 2015 - wr@rosenauer.org
 
 - update to Firefox 36.0.1
diff -r d560fce2b8a3 -r 6fabac5939cb MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Sun Mar 08 13:28:55 2015 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Sat Mar 21 16:55:12 2015 +0100
@@ -19,9 +19,9 @@
 
 # changed with every update
 %define major 36
-%define mainver %major.0.1
+%define mainver %major.0.4
 %define update_channel release
-%define releasedate 2015030500
+%define releasedate 2015032000
 
 # general build definitions
 %if "%{update_channel}" != "aurora"
@@ -471,7 +471,7 @@
 for size in 16 32 48; do
 %endif
   mkdir -p %{buildroot}%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/
-  ln -sf %{progdir}/browser/chrome/icons/default/default$size.png \
+  cp %{buildroot}%{progdir}/browser/chrome/icons/default/default$size.png \
          %{buildroot}%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/%{progname}.png
 done
 # excludes
diff -r d560fce2b8a3 -r 6fabac5939cb MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Sun Mar 08 13:28:55 2015 +0100
+++ b/MozillaFirefox/create-tar.sh	Sat Mar 21 16:55:12 2015 +0100
@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_36_0_1_RELEASE"
-VERSION="36.0.1"
+RELEASE_TAG="FIREFOX_36_0_4_RELEASE"
+VERSION="36.0.4"
 
 # mozilla
 if [ -d mozilla ]; then