# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1353331442 -3600
# Node ID 3f9d8370653d0f85e1e968fd2040e7db087d9146
# Parent  9852e10fdf9ba95a67444b8a9068c42521bd64df
17.0 final release

diff -r 9852e10fdf9b -r 3f9d8370653d MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Wed Oct 24 08:26:54 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Mon Nov 19 14:24:02 2012 +0100
@@ -1,9 +1,19 @@
 -------------------------------------------------------------------
-Wed Oct 24 06:24:39 UTC 2012 - wr@rosenauer.org
-
-- update to Firefox 17.0b3
+Sat Nov 17 06:40:46 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 17.0 (bnc#790140)
 - rebased patches
-- use internal NSPR for now (bmo#776877)
+- disabled WebRTC since build is broken (bmo#776877)
+
+-------------------------------------------------------------------
+Wed Oct 24 08:27:29 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 16.0.2 (bnc#786522)
+  * MFSA 2012-90/CVE-2012-4194/CVE-2012-4195/CVE-2012-4196
+    (bmo#800666, bmo#793121, bmo#802557)
+    Fixes for Location object issues
+- bring back Obsoletes for libproxy's mozjs plugin for distributions
+  before 12.2 to avoid crashes
 
 -------------------------------------------------------------------
 Thu Oct 11 01:51:16 UTC 2012 - wr@rosenauer.org
diff -r 9852e10fdf9b -r 3f9d8370653d MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Oct 24 08:26:54 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Mon Nov 19 14:24:02 2012 +0100
@@ -17,9 +17,9 @@
 #
 
 
-%define major 16
-%define mainver %major.99
-%define update_channel beta
+%define major 17
+%define mainver %major.0
+%define update_channel release
 
 Name:           MozillaFirefox
 BuildRequires:  Mesa-devel
@@ -54,7 +54,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012102300
+%define         releasedate 2012111600
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -276,7 +276,7 @@
 ac_add_options --sysconfdir=%{_sysconfdir}
 ac_add_options --mandir=%{_mandir}
 ac_add_options --includedir=%{_includedir}
-#ac_add_options --with-system-nspr
+ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n
 #ac_add_options --with-system-jpeg    # libjpeg-turbo is used internally
@@ -289,6 +289,7 @@
 ac_add_options --enable-startup-notification
 #ac_add_options --enable-chrome-format=jar
 ac_add_options --enable-update-channel=%{update_channel}
+ac_add_options --disable-webrtc   # webrtc build is broken for system NSPR
 EOF
 %if %suse_version > 1130
 cat << EOF >> $MOZCONFIG
diff -r 9852e10fdf9b -r 3f9d8370653d MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Wed Oct 24 08:26:54 2012 +0200
+++ b/MozillaFirefox/create-tar.sh	Mon Nov 19 14:24:02 2012 +0100
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="beta"
+CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_17_0b3_RELEASE"
-VERSION="16.99"
+RELEASE_TAG="FIREFOX_17_0_RELEASE"
+VERSION="17.0"
 
 # mozilla
 echo "cloning $BRANCH..."
diff -r 9852e10fdf9b -r 3f9d8370653d firefox-kde.patch
--- a/firefox-kde.patch	Wed Oct 24 08:26:54 2012 +0200
+++ b/firefox-kde.patch	Mon Nov 19 14:24:02 2012 +0100
@@ -2,7 +2,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1268 @@
+@@ -0,0 +1,1272 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -700,6 +700,9 @@
 +                      command="Social:ToggleNotifications"
 +                      label="&social.toggleNotifications.label;"
 +                      accesskey="&social.toggleNotifications.accesskey;"/>
++            <menuseparator/>
++            <menuitem id="social-remove-menuitem"
++                      oncommand="SocialUI.disableWithConfirmation();"/>
 +          </menupopup>
 +        </toolbarbutton>
 +      </toolbaritem>
@@ -1082,7 +1085,8 @@
 +              observes="socialSidebarBroadcaster"/>
 +    <vbox id="social-sidebar-box"
 +          class="chromeclass-extrachrome"
-+          observes="socialSidebarBroadcaster">
++          observes="socialSidebarBroadcaster"
++          persist="width">
 +      <browser id="social-sidebar-browser"
 +               type="content"
 +               disableglobalhistory="true"
diff -r 9852e10fdf9b -r 3f9d8370653d xulrunner/create-tar.sh
--- a/xulrunner/create-tar.sh	Wed Oct 24 08:26:54 2012 +0200
+++ b/xulrunner/create-tar.sh	Mon Nov 19 14:24:02 2012 +0100
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="beta"
+CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_17_0b3_RELEASE"
-VERSION="16.99"
+RELEASE_TAG="FIREFOX_17_0_RELEASE"
+VERSION="17.0"
 
 # mozilla
 echo "cloning $BRANCH..."
diff -r 9852e10fdf9b -r 3f9d8370653d xulrunner/xulrunner.changes
--- a/xulrunner/xulrunner.changes	Wed Oct 24 08:26:54 2012 +0200
+++ b/xulrunner/xulrunner.changes	Mon Nov 19 14:24:02 2012 +0100
@@ -1,9 +1,17 @@
 -------------------------------------------------------------------
-Wed Oct 24 06:25:36 UTC 2012 - wr@rosenauer.org
+Sat Nov 17 06:47:11 UTC 2012 - wr@rosenauer.org
+
+- update to 17.0 (bnc#790140)
+- rebased patches
+- disabled WebRTC since build is broken (bmo#776877)
 
-- update to 17.0b3
-- rebased patches
-- use internal NSPR for now (bmo#776877)
+-------------------------------------------------------------------
+Wed Oct 24 08:28:49 UTC 2012 - wr@rosenauer.org
+
+- update to 16.0.2 (bnc#786522)
+  * MFSA 2012-90/CVE-2012-4194/CVE-2012-4195/CVE-2012-4196
+    (bmo#800666, bmo#793121, bmo#802557)
+    Fixes for Location object issues
 
 -------------------------------------------------------------------
 Thu Oct 11 01:50:19 UTC 2012 - wr@rosenauer.org
diff -r 9852e10fdf9b -r 3f9d8370653d xulrunner/xulrunner.spec
--- a/xulrunner/xulrunner.spec	Wed Oct 24 08:26:54 2012 +0200
+++ b/xulrunner/xulrunner.spec	Mon Nov 19 14:24:02 2012 +0100
@@ -44,9 +44,9 @@
 %endif
 BuildRequires:  mozilla-nspr-devel >= 4.9.2
 BuildRequires:  mozilla-nss-devel >= 3.13.6
-Version:        16.99
+Version:        17.0
 Release:        0
-%define         releasedate 2012102300
+%define         releasedate 2012111600
 %define         version_internal 17.0
 %define         apiversion 17
 %define         uaweight 1700000
@@ -243,6 +243,7 @@
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-startup-notification
 ac_add_options --enable-shared-js
+ac_add_options --disable-webrtc   # does not build with system NSPR
 #ac_add_options --enable-debug
 EOF
 %if %suse_version > 1130
@@ -313,6 +314,8 @@
      -type f -perm -111 -exec chmod a-x {} \;
 find $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/ \
      -name "*.js" -o -name "*.xpm" -o -name "*.png" | xargs chmod a-x
+# remove mkdir.done files from installed base
+find $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal} -name ".mkdir.done" | xargs rm
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/extensions
 # fixing SDK dynamic libs (symlink instead of copy)
 rm $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/lib/*.so