# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1469867570 -7200
# Node ID 4f801233e935a0f24170b2eab32dd2195bf61000
# Parent  4e5807284ef0e40c1d71521fa40b4017d2a3c494
merge contributions from OBS

diff -r 4e5807284ef0 -r 4f801233e935 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Wed Jun 15 09:53:47 2016 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Sat Jul 30 10:32:50 2016 +0200
@@ -1,8 +1,32 @@
 -------------------------------------------------------------------
+Fri Jul 29 01:26:13 UTC 2016 - badshah400@gmail.com
+
+- Update description and screenshots in appdata.xml file.
+
+-------------------------------------------------------------------
+Sat Jul 23 20:13:08 UTC 2016 - antoine.belvire@laposte.net
+
+- Fix Firefox crash on startup on i586 (boo#986541):
+  * Add -fno-delete-null-pointer-checks and
+    -fno-inline-small-functions to CFLAGS
+
+-------------------------------------------------------------------
+Tue Jul 19 20:12:11 UTC 2016 - mailaender@opensuse.org
+
+- Update the appdata.xml file (replace Windows XP screenshot)
+
+-------------------------------------------------------------------
+Wed Jun 29 09:25:41 UTC 2016 - astieger@suse.com
+
+- Mozilla Firefox 47.0.1:
+  * Selenium WebDriver may cause Firefox to crash at startup
+    (bmo#1280854)
+
+-------------------------------------------------------------------
 Wed Jun 15 07:52:18 UTC 2016 - wr@rosenauer.org
 
 - mozilla-binutils-visibility.patch to fix build issues with
-  gcc/binutils combination used in Leap 42.2
+  gcc/binutils combination used in Leap 42.2 (boo#984637)
 
 -------------------------------------------------------------------
 Tue Jun 14 08:35:03 UTC 2016 - badshah400@gmail.com
diff -r 4e5807284ef0 -r 4f801233e935 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Jun 15 09:53:47 2016 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sat Jul 30 10:32:50 2016 +0200
@@ -19,9 +19,9 @@
 
 # changed with every update
 %define major 47
-%define mainver %major.0
+%define mainver %major.0.1
 %define update_channel release
-%define releasedate 20160606000000
+%define releasedate 20160628000000
 
 # PIE, full relro (x86_64 for now)
 %define build_hardened 1
@@ -294,6 +294,10 @@
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_GOOGLE_API_KEY=%{_google_api_key}
 export CFLAGS="%{optflags} -fno-strict-aliasing"
+# boo#986541: add -fno-delete-null-pointer-checks and -fno-inline-small-functions for gcc6
+%if 0%{?suse_version} > 1320
+export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -fno-inline-small-functions"
+%endif
 %ifarch %arm
 export CFLAGS="${CFLAGS/-g / }"
 %endif
diff -r 4e5807284ef0 -r 4f801233e935 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Wed Jun 15 09:53:47 2016 +0200
+++ b/MozillaFirefox/create-tar.sh	Sat Jul 30 10:32:50 2016 +0200
@@ -7,8 +7,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_47_0_RELEASE"
-VERSION="47.0"
+RELEASE_TAG="FIREFOX_47_0_1_RELEASE"
+VERSION="47.0.1"
 
 # mozilla
 if [ -d mozilla ]; then
diff -r 4e5807284ef0 -r 4f801233e935 MozillaFirefox/firefox-appdata.xml
--- a/MozillaFirefox/firefox-appdata.xml	Wed Jun 15 09:53:47 2016 +0200
+++ b/MozillaFirefox/firefox-appdata.xml	Sat Jul 30 10:32:50 2016 +0200
@@ -1,31 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-
-<!-- HOUSEKEEPING, REMOVE THIS COMMENT WHEN THIS GOES UPSTREAM
-BugReportURL: https://bugzilla.mozilla.org/show_bug.cgi?id=1071061
-SentUpstream: 2014-09-22
+<!--
+Upstream does not want to ship it https://bugzilla.mozilla.org/show_bug.cgi?id=1071061
+so maintain a stub in here.
 -->
 
-<application>
+<component>
   <id type="desktop">firefox.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
+  <name>Firefox Web Browser</name>
+  <project_license>MPL-2.0</project_license>
+  <summary>Mozilla Firefox Web Browser</summary>
+  <url type="homepage">http://www.mozilla.org/</url>
   <description>
-    <p>
-      Bringing together all kinds of awesomeness to make browsing better for you.
-      Get to your favorite sites quickly – even if you don’t remember the URLs.
-      Type your term into the location bar (aka the Awesome Bar) and the autocomplete
-      function will include possible matches from your browsing history, bookmarked
-      sites and open tabs.
-    </p>
-    <!-- FIXME: Needs another couple of paragraphs -->
+    <p>Mozilla Firefox is a standalone web browser, designed for privacy, security, standards
+compliance and performance.  Its functionality can be enhanced via a plethora of extensions.</p>
+    <p>Firefox makes your daily web browsing fun and easy with a number of features, including:</p>
+    <ul>
+      <li>Tabbed browsing</li>
+      <li>Private browsing including do-not-track enabled by default</li>
+      <li>Advanced phishing and malware protection</li>
+      <li>Spell checking</li>
+      <li>Incremental find within pages</li>
+      <li>Live bookmarking and Smart Bookmarks</li>
+      <li>Download manager</li>
+      <li>Location-aware browsing</li>
+      <li>Compliant with modern web standards</li>
+      <li>Modern web development tools</li>
+      <li>Available in a wide number of locales</li>
+      <li>A thriving ecosystem of themes and extensions at https://addons.mozilla.org</li>
+    </ul>
   </description>
-  <url type="homepage">http://www.mozilla.org/en-US/</url>
   <screenshots>
-  <!-- FIXME: Needs an official up to date screenshot -->
-    <screenshot type="default">https://wiki.mozilla.org/images/e/e1/Bon_Echo_Beta_2_Screen_Shot_1.PNG</screenshot>
+    <screenshot type="default">
+      <image height="800" width="1280">https://support.cdn.mozilla.net/media/uploads/gallery/images/2015-05-20-16-04-21-88bff4.png</image>
+      <caption>New tab page with speed dials</caption>
+    </screenshot>
+    <screenshot>
+      <image height="439" width="620">https://support.cdn.mozilla.net/media/uploads/gallery/images/2015-12-22-15-15-05-3c0a80.png</image>
+      <caption>Search suggestions from home page</caption>
+    </screenshot>
+    <screenshot>
+      <image height="394" width="700">https://addons.cdn.mozilla.net/user-media/previews/full/159/159648.png</image>
+      <caption>Firefox with Adwaita theme</caption>
+    </screenshot>
   </screenshots>
-  <!-- FIXME: change this to an upstream email address for spec updates
-  <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
-   -->
-</application>
-
+  <update_contact>mdn@lists.mozilla.org</update_contact>
+</component>