# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1386537251 -3600
# Node ID d09dea6b31b1daddafe85d6886c344c1728c237c
# Parent  ab25aac2aa8383741ad9b2208397574fcb63985f
26.0 final

diff -r ab25aac2aa83 -r d09dea6b31b1 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Tue Nov 19 18:46:37 2013 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Sun Dec 08 22:14:11 2013 +0100
@@ -1,9 +1,9 @@
 -------------------------------------------------------------------
-Mon Nov 18 13:50:16 UTC 2013 - wr@rosenauer.org
-
-- update to Firefox 26.0b5
+Sun Dec  8 20:26:23 UTC 2013 - wr@rosenauer.org
+
+- update to Firefox 26.0 (bnc#854367, bnc#854368)
   * rebased patches
-  * requires NSPR 4.10.2 and NSS 3.15.3
+  * requires NSPR 4.10.2 and NSS 3.15.3.1
 - removed gecko.js preference file as GStreamer is enabled by
   default now
 
diff -r ab25aac2aa83 -r d09dea6b31b1 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Nov 19 18:46:37 2013 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Sun Dec 08 22:14:11 2013 +0100
@@ -17,9 +17,9 @@
 #
 
 
-%define major 25
-%define mainver %major.99
-%define update_channel beta
+%define major 26
+%define mainver %major.0
+%define update_channel release
 
 %if %suse_version > 1220
 %define gstreamer_ver 0.10
@@ -51,7 +51,7 @@
 BuildRequires:  wireless-tools
 %endif
 BuildRequires:  mozilla-nspr-devel >= 4.10.2
-BuildRequires:  mozilla-nss-devel >= 3.15.3
+BuildRequires:  mozilla-nss-devel >= 3.15.3.1
 BuildRequires:  nss-shared-helper-devel
 %if %suse_version > 1210
 BuildRequires:  pkgconfig(gstreamer-%gstreamer_ver)
@@ -63,7 +63,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2013111800
+%define         releasedate 2013120700
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
diff -r ab25aac2aa83 -r d09dea6b31b1 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Tue Nov 19 18:46:37 2013 +0100
+++ b/MozillaFirefox/create-tar.sh	Sun Dec 08 22:14:11 2013 +0100
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="beta"
+CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_26_0b5_RELEASE"
-VERSION="25.99"
+RELEASE_TAG="FIREFOX_26_0_RELEASE"
+VERSION="26.0"
 
 # mozilla
 if [ -d mozilla ]; then