# HG changeset patch # User Wolfgang Rosenauer # Date 1339658426 -7200 # Node ID f99d16f8b0f5d6a0f0a977bf15750355ad4b79b4 # Parent ad1b2d6da3909cce56f0d14301c521eae9c9654f 14.0b7 diff -r ad1b2d6da390 -r f99d16f8b0f5 MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Mon Jun 11 20:16:11 2012 +0200 +++ b/MozillaFirefox/MozillaFirefox.changes Thu Jun 14 09:20:26 2012 +0200 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Mon Jun 11 12:57:51 UTC 2012 - wr@rosenauer.org - -- update to 14.0b6 (20120605) +Thu Jun 14 07:19:33 UTC 2012 - wr@rosenauer.org + +- update to 14.0b7 - license change from tri license to MPL-2.0 - fix crashreporter restart option (bmo#762780) - reenabled mozilla-yarr-pcre.patch to fix build for PPC diff -r ad1b2d6da390 -r f99d16f8b0f5 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Mon Jun 11 20:16:11 2012 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Thu Jun 14 09:20:26 2012 +0200 @@ -54,7 +54,7 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2012060500 +%define releasedate 2012061300 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -112,8 +112,6 @@ Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) Recommends: libcanberra0 -# libproxy's mozjs pacrunner crashes FF (bnc#759123) -Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7 %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} diff -r ad1b2d6da390 -r f99d16f8b0f5 MozillaFirefox/create-tar.sh --- a/MozillaFirefox/create-tar.sh Mon Jun 11 20:16:11 2012 +0200 +++ b/MozillaFirefox/create-tar.sh Thu Jun 14 09:20:26 2012 +0200 @@ -2,7 +2,7 @@ CHANNEL="beta" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_14_0b6_RELEASE" +RELEASE_TAG="FIREFOX_14_0b7_RELEASE" VERSION="13.99" # mozilla diff -r ad1b2d6da390 -r f99d16f8b0f5 firefox-branded-icons.patch --- a/firefox-branded-icons.patch Mon Jun 11 20:16:11 2012 +0200 +++ b/firefox-branded-icons.patch Thu Jun 14 09:20:26 2012 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 9e165dc62d6ba0c3b2a82387a238fe5811acdc92 +# Parent 7f0b0738f036cd9d2e51c51c3552dc608ac598f9 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in @@ -23,9 +23,9 @@ libs:: $(srcdir)/profile/prefs.js $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile + ifndef LIBXUL_SDK # channel-prefs.js is handled separate from other prefs due to bug 756325 libs:: $(srcdir)/profile/channel-prefs.js - $(NSINSTALL) -D $(DIST)/bin/defaults/pref diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in diff -r ad1b2d6da390 -r f99d16f8b0f5 firefox-kde.patch --- a/firefox-kde.patch Mon Jun 11 20:16:11 2012 +0200 +++ b/firefox-kde.patch Thu Jun 14 09:20:26 2012 +0200 @@ -1720,16 +1720,20 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -500,16 +500,17 @@ - #ifdef MOZ_SERVICES_SYNC +@@ -501,18 +501,20 @@ @BINPATH@/@PREF_DIR@/services-sync.js #endif @BINPATH@/greprefs.js @BINPATH@/defaults/autoconfig/platform.js @BINPATH@/defaults/autoconfig/prefcalls.js + #ifndef LIBXUL_SDK ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) @BINPATH@/defaults/pref/channel-prefs.js +@BINPATH@/defaults/pref/kde.js + #else + @BINPATH@/@PREF_DIR@/channel-prefs.js ++@BINPATH@/@PREF_DIR@/kde.js + #endif @BINPATH@/defaults/profile/prefs.js ; [Layout Engine Resources] @@ -1737,4 +1741,3 @@ @BINPATH@/res/EditorOverride.css @BINPATH@/res/contenteditable.css @BINPATH@/res/designmode.css - @BINPATH@/res/TopLevelImageDocument.css diff -r ad1b2d6da390 -r f99d16f8b0f5 xulrunner/create-tar.sh --- a/xulrunner/create-tar.sh Mon Jun 11 20:16:11 2012 +0200 +++ b/xulrunner/create-tar.sh Thu Jun 14 09:20:26 2012 +0200 @@ -2,7 +2,7 @@ CHANNEL="beta" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_14_0b6_RELEASE" +RELEASE_TAG="FIREFOX_14_0b7_RELEASE" VERSION="13.99" # mozilla diff -r ad1b2d6da390 -r f99d16f8b0f5 xulrunner/xulrunner.changes --- a/xulrunner/xulrunner.changes Mon Jun 11 20:16:11 2012 +0200 +++ b/xulrunner/xulrunner.changes Thu Jun 14 09:20:26 2012 +0200 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Fri Jun 8 04:53:17 UTC 2012 - wr@rosenauer.org +Thu Jun 14 07:20:01 UTC 2012 - wr@rosenauer.org -- update to 14.0 (20120605) +- update to 14.0b7 - license change from tri license to MPL-2.0 ------------------------------------------------------------------- diff -r ad1b2d6da390 -r f99d16f8b0f5 xulrunner/xulrunner.spec --- a/xulrunner/xulrunner.spec Mon Jun 11 20:16:11 2012 +0200 +++ b/xulrunner/xulrunner.spec Thu Jun 14 09:20:26 2012 +0200 @@ -46,7 +46,7 @@ BuildRequires: mozilla-nss-devel >= 3.13.4 Version: 13.99 Release: 0 -%define releasedate 2012060500 +%define releasedate 20120613 %define version_internal 14.0 %define apiversion 14 %define uaweight 1400000 @@ -77,7 +77,6 @@ Patch7: mozilla-ntlm-full-path.patch Patch8: mozilla-dump_syms-static.patch Patch9: mozilla-sle11.patch -Patch10: mozilla-arm-cpu-detection.patch Patch11: mozilla-yarr-pcre.patch Patch12: mozilla-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -196,7 +195,6 @@ %if %suse_version < 1120 %patch9 -p1 %endif -%patch10 -p1 %patch11 -p1 %patch12 -p1