From 66185af6e0e7b169aee3993f792f9a558e61758a Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 8 Nov 2011 19:00:25 +0100 Subject: [PATCH] added install patch --- thunderbird.spec | 4 ++++ xulrunner-install.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 xulrunner-install.patch diff --git a/thunderbird.spec b/thunderbird.spec index 79194e4..035297b 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -63,6 +63,9 @@ Patch9: mozilla-670719.patch Patch10: xulrunner-2.0-network-link-service.patch Patch11: xulrunner-2.0-NetworkManager09.patch +# Build patches +Patch100: xulrunner-install.patch + %if %{official_branding} # Required by Mozilla Corporation @@ -143,6 +146,7 @@ cd mozilla %patch9 -p1 -b .moz670719 %patch10 -p1 -b .link-service %patch11 -p1 -b .NetworkManager09 +%patch100 -p2 -b .install cd .. %if %{official_branding} diff --git a/xulrunner-install.patch b/xulrunner-install.patch new file mode 100644 index 0000000..c1393ef --- /dev/null +++ b/xulrunner-install.patch @@ -0,0 +1,12 @@ +diff -up comm-release/mozilla/toolkit/mozapps/installer/packager.mk.install comm-release/mozilla/toolkit/mozapps/installer/packager.mk +--- comm-release/mozilla/toolkit/mozapps/installer/packager.mk.install 2011-11-05 10:21:10.000000000 +0100 ++++ comm-release/mozilla/toolkit/mozapps/installer/packager.mk 2011-11-08 18:48:08.674042803 +0100 +@@ -401,7 +401,7 @@ PRECOMPILE_GRE=$$PWD + endif + + GENERATE_CACHE = \ +- $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js -e "populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');" && \ ++ $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('$(PRECOMPILE_DIR)', 'omni.jar', 'startupCache.zip');" && \ + rm -rf jsloader && \ + $(UNZIP) startupCache.zip && \ + rm startupCache.zip && \