merge from firefox33
authorWolfgang Rosenauer <wr@rosenauer.org>
Thu, 16 Oct 2014 21:20:22 +0200
changeset 778 9483ff78d5a0
parent 774 f61bd1cd52c2 (diff)
parent 777 f1c5ccf4d1a7 (current diff)
child 779 354c672efefa
merge from firefox33 preparation for Firefox 34
MozillaFirefox/MozillaFirefox.spec
MozillaFirefox/create-tar.sh
MozillaFirefox/mozilla-libproxy-compat.patch
mozilla-libproxy-compat.patch
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Oct 16 19:29:34 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Oct 16 21:20:22 2014 +0200
@@ -18,8 +18,8 @@
 
 
 %define major 33
-%define mainver %major.0
-%define update_channel release
+%define mainver %major.99
+%define update_channel beta
 
 %if %suse_version > 1210
 %if %suse_version > 1310
@@ -55,7 +55,7 @@
 BuildRequires:  wireless-tools
 %endif
 BuildRequires:  mozilla-nspr-devel >= 4.10.7
-BuildRequires:  mozilla-nss-devel >= 3.17.1
+BuildRequires:  mozilla-nss-devel >= 3.17.2
 BuildRequires:  nss-shared-helper-devel
 BuildRequires:  pkgconfig(libpulse)
 %if %suse_version > 1210
@@ -74,7 +74,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2014101000
+%define         releasedate 2014101500
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
--- a/MozillaFirefox/create-tar.sh	Thu Oct 16 19:29:34 2014 +0200
+++ b/MozillaFirefox/create-tar.sh	Thu Oct 16 21:20:22 2014 +0200
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="release"
+CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_33_0_RELEASE"
-VERSION="33.0"
+RELEASE_TAG="FIREFOX_34_0b1_RELEASE"
+VERSION="33.99"
 
 # mozilla
 if [ -d mozilla ]; then