# HG changeset patch # User Wolfgang Rosenauer # Date 1286258096 -7200 # Node ID cba7c6321c84af94a3b393aaa42c17fae966456b # Parent 995e803e819885433abe63d099986bde3a8be333 snapshot 20101003; packaging langpacks diff -r 995e803e8198 -r cba7c6321c84 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Wed Sep 29 21:05:58 2010 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Tue Oct 05 07:54:56 2010 +0200 @@ -36,7 +36,7 @@ Provides: firefox Version: 4.0b Release: 1 -%define releasedate 2010083100 +%define releasedate 2010100300 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -63,6 +63,7 @@ Patch11: firefox-no-sync-l10n.patch Patch12: firefox-sync-system-nss.patch Patch13: firefox-sync-build.patch +Patch14: firefox-libxulsdk-locales.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils @@ -172,6 +173,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build export MOZ_BUILD_DATE=%{releasedate} @@ -238,22 +240,23 @@ pushd $RPM_BUILD_DIR/compare-locales PYTHONPATH=lib \ scripts/compare-locales -m ../l10n-merged/$locale \ + ../mozilla/toolkit/locales/l10n.ini ../l10n $locale + PYTHONPATH=lib \ + scripts/compare-locales -m ../l10n-merged/$locale \ ../mozilla/browser/locales/l10n.ini ../l10n $locale popd LOCALE_MERGEDIR=../l10n-merged \ make -C browser/locales libs-$locale - cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \ - $RPM_BUILD_ROOT%{progdir}/chrome - cp dist/xpi-stage/locale-$locale/chrome/$locale.manifest \ - $RPM_BUILD_ROOT%{progdir}/chrome + cp -r dist/xpi-stage/locale-$locale \ + $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org # 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 [ "$_match" = "$locale" ] && _matched=1 done [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other - echo %{progdir}/chrome/$locale.jar >> %{_tmppath}/translations.$_l10ntarget - echo %{progdir}/chrome/$locale.manifest >> %{_tmppath}/translations.$_l10ntarget + echo %{progdir}/extensions/langpack-$locale@firefox.mozilla.org \ + >> %{_tmppath}/translations.$_l10ntarget esac done %endif @@ -357,7 +360,9 @@ %{progdir}/components/ %exclude %{progdir}/defaults/profile/bookmarks.html %{progdir}/defaults/ -%{progdir}/extensions/ +%dir %{progdir}/extensions/ +%{progdir}/extensions/testpilot@labs.mozilla.com +%{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/icons/ %{progdir}/modules/ %{progdir}/searchplugins/ diff -r 995e803e8198 -r cba7c6321c84 MozillaFirefox/firefox-libxulsdk-locales.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MozillaFirefox/firefox-libxulsdk-locales.patch Tue Oct 05 07:54:56 2010 +0200 @@ -0,0 +1,1 @@ +../firefox-libxulsdk-locales.patch \ No newline at end of file diff -r 995e803e8198 -r cba7c6321c84 firefox-libxulsdk-locales.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/firefox-libxulsdk-locales.patch Tue Oct 05 07:54:56 2010 +0200 @@ -0,0 +1,52 @@ +# HG changeset patch +# Parent 6e05daaf579aa134cadb3e42451c1918409d18c3 + +diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in +--- a/browser/locales/Makefile.in ++++ b/browser/locales/Makefile.in +@@ -180,20 +180,18 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS + $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins + + install:: $(addsuffix .xml,$(SEARCH_PLUGINS)) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins + + + libs-%: + $(NSINSTALL) -D $(DIST)/install +-ifndef LIBXUL_SDK + @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 + @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 +-endif + ifdef MOZ_SERVICES_SYNC + @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + endif + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 + @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 + + + repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" +diff --git a/browser/makefiles.sh b/browser/makefiles.sh +--- a/browser/makefiles.sh ++++ b/browser/makefiles.sh +@@ -74,16 +74,21 @@ browser/installer/windows/Makefile + browser/locales/Makefile + browser/themes/Makefile + browser/themes/pinstripe/browser/Makefile + browser/themes/pinstripe/communicator/Makefile + browser/themes/pinstripe/Makefile + browser/themes/winstripe/browser/Makefile + browser/themes/winstripe/communicator/Makefile + browser/themes/winstripe/Makefile ++netwerk/locales/Makefile ++dom/locales/Makefile ++security/manager/locales/Makefile ++extensions/spellcheck/locales/Makefile ++toolkit/locales/Makefile + $MOZ_BRANDING_DIRECTORY/Makefile + $MOZ_BRANDING_DIRECTORY/content/Makefile + $MOZ_BRANDING_DIRECTORY/locales/Makefile + " + + if [ "$ENABLE_TESTS" ]; then + add_makefiles " + browser/base/content/test/Makefile diff -r 995e803e8198 -r cba7c6321c84 mozilla-kde.patch --- a/mozilla-kde.patch Wed Sep 29 21:05:58 2010 +0200 +++ b/mozilla-kde.patch Tue Oct 05 07:54:56 2010 +0200 @@ -2550,9 +2550,9 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android) OSHELPER += nsMIMEInfoAndroid.cpp OSHELPER += nsAndroidHandlerApp.cpp + OSHELPER += nsExternalSharingAppService.cpp + EXPORTS += nsExternalSharingAppService.h endif - - ifeq ($(MOZ_WIDGET_TOOLKIT),qt) diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp new file mode 100644 --- /dev/null diff -r 995e803e8198 -r cba7c6321c84 mozilla-xulrunner20/create-tar.sh --- a/mozilla-xulrunner20/create-tar.sh Wed Sep 29 21:05:58 2010 +0200 +++ b/mozilla-xulrunner20/create-tar.sh Tue Oct 05 07:54:56 2010 +0200 @@ -1,7 +1,7 @@ #!/bin/bash BRANCH="mozilla-central" -RELEASE_TAG="FIREFOX_4_0b5_RELEASE" +RELEASE_TAG="default" VERSION="2.0b" # mozilla diff -r 995e803e8198 -r cba7c6321c84 mozilla-xulrunner20/mozilla-xulrunner20.spec --- a/mozilla-xulrunner20/mozilla-xulrunner20.spec Wed Sep 29 21:05:58 2010 +0200 +++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec Tue Oct 05 07:54:56 2010 +0200 @@ -32,8 +32,8 @@ License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Version: 2.0b Release: 1 -%define releasedate 2010083100 -%define version_internal 2.0b5 +%define releasedate 2010100300 +%define version_internal 2.0b7pre %define apiversion 2.0 %define uaweight 199900 Summary: Mozilla Runtime Environment 2.0 diff -r 995e803e8198 -r cba7c6321c84 series --- a/series Wed Sep 29 21:05:58 2010 +0200 +++ b/series Tue Oct 05 07:54:56 2010 +0200 @@ -25,3 +25,4 @@ firefox-no-sync-l10n.patch firefox-sync-system-nss.patch firefox-sync-build.patch +firefox-libxulsdk-locales.patch