From 5297cd2e74d494ae0b77ef16fa2d1e916d986f7e Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 29 May 2012 19:40:15 +0000 Subject: [PATCH] - just define xulrunner_ver, minor magick not suitable for icedove/thunderbird - updated system-xulrunner patch Changed files: icedove-system-xulrunner.patch -> 1.3 icedove.spec -> 1.158 --- icedove-system-xulrunner.patch | 9 +++++---- icedove.spec | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/icedove-system-xulrunner.patch b/icedove-system-xulrunner.patch index 709ea55..4260f50 100644 --- a/icedove-system-xulrunner.patch +++ b/icedove-system-xulrunner.patch @@ -1,6 +1,6 @@ ---- mozilla/mail/app/Makefile.in.orig 2012-02-16 11:18:22.000000000 +0100 -+++ mozilla/mail/app/Makefile.in 2012-03-22 16:43:33.608721456 +0100 -@@ -44,5 +44,7 @@ +--- mozilla/mail/app/Makefile.in.orig 2012-04-28 21:31:30.000000000 +0200 ++++ mozilla/mail/app/Makefile.in 2012-05-29 20:12:43.887999371 +0200 +@@ -44,6 +44,8 @@ AB_CD = $(MOZ_UI_LOCALE) @@ -8,12 +8,13 @@ + GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone) GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID) + @@ -79,6 +81,7 @@ $(srcdir)/profile/channel-prefs.js \ $(NULL) +ifndef LIBXUL_SDK - ifneq (,$(filter OS2 Darwin WINCE WINNT,$(OS_ARCH))) + ifneq (,$(filter OS2 Darwin WINNT,$(OS_ARCH))) PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX) else @@ -88,8 +91,6 @@ diff --git a/icedove.spec b/icedove.spec index 9452742..8e65a5d 100644 --- a/icedove.spec +++ b/icedove.spec @@ -23,9 +23,7 @@ %define nspr_ver 4.9 %define nss_ver 3.13.3 -# convert thunderbird release number to platform version: 12.0.x -> 12.0.x -%define xulrunner_main 12.0 -%define xulrunner_ver %(v=%{version}; echo %{xulrunner_main}${v#12.0}) +%define xulrunner_ver 12.0 %if %{without xulrunner} # The actual sqlite version (see RHBZ#480989): -- 2.44.0