Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update to 12.0b3
authorWolfgang Rosenauer <wr@rosenauer.org>
Sat, 31 Mar 2012 09:26:42 +0200
changeset 418 ecd5bb5744dc
parent 417 62102cc5132a
child 419 f6b055dd94bc
child 420 e0c0ff1d5ae4
update to 12.0b3
MozillaFirefox/MozillaFirefox.changes file | annotate | diff | comparison | revisions
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions
MozillaFirefox/create-tar.sh file | annotate | diff | comparison | revisions
firefox-multilocale-chrome.patch file | annotate | diff | comparison | revisions
xulrunner/create-tar.sh file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.changes	Mon Mar 26 08:30:08 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Sat Mar 31 09:26:42 2012 +0200
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Thu Mar 22 09:27:26 UTC 2012 - wr@rosenauer.org
 
-- update to Firefox 12.0b2
+- update to Firefox 12.0b3
   * rebased patches
 - added mozilla-libnotify.patch to allow fallback from libnotify
   to xul based events if no notification-daemon is running
--- a/MozillaFirefox/MozillaFirefox.spec	Mon Mar 26 08:30:08 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sat Mar 31 09:26:42 2012 +0200
@@ -324,6 +324,8 @@
 export MOZ_SOURCE_STAMP=$REV
 export MOZ_SOURCE_REPO=$REPO
 make -C browser/installer STRIP=/bin/true
+#DEBUG (break the build if searchplugins are missing / temporary)
+grep amazondotcom dist/firefox/omni.ja
 # copy tree into RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{progdir}
 cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir}
@@ -358,8 +360,9 @@
   	make -C browser/locales langpack-$locale
 	cp -rL dist/xpi-stage/locale-$locale \
 	       $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org
-	# remove prefs and profile defaults from langpack
+	# remove prefs, profile defaults, and hyphenation from langpack
 	rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/defaults
+	rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/hyphenation
 	# check against the fixed common list and sort into the right filelist
 	_matched=0
 	for _match in ar ca cs da de en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do
--- a/MozillaFirefox/create-tar.sh	Mon Mar 26 08:30:08 2012 +0200
+++ b/MozillaFirefox/create-tar.sh	Sat Mar 31 09:26:42 2012 +0200
@@ -2,7 +2,7 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_12_0b2_RELEASE"
+RELEASE_TAG="FIREFOX_12_0b3_RELEASE"
 VERSION="11.99"
 
 # mozilla
--- a/firefox-multilocale-chrome.patch	Mon Mar 26 08:30:08 2012 +0200
+++ b/firefox-multilocale-chrome.patch	Sat Mar 31 09:26:42 2012 +0200
@@ -75,7 +75,7 @@
 +	  -s $(LOCALE_SRCDIR)/searchplugins \
 +	  $(MAKE_JARS_FLAGS) tmp-search.jar.mn
  
-+export:: searchplugins
++libs:: searchplugins
 +
 +GARBAGE += tmp-search.jar.mn
  
--- a/xulrunner/create-tar.sh	Mon Mar 26 08:30:08 2012 +0200
+++ b/xulrunner/create-tar.sh	Sat Mar 31 09:26:42 2012 +0200
@@ -2,7 +2,7 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_12_0b2_RELEASE"
+RELEASE_TAG="FIREFOX_12_0b3_RELEASE"
 VERSION="11.99"
 
 # mozilla
mozilla