From 37973fb0e52dda0fb6f0665bb0c1e252863aba34 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Wed, 6 Jun 2012 05:58:23 +0000
Subject: [PATCH] - up to 13.0 - enigmail 1.4.2

Changed files:
    icedove-install.patch -> 1.9
    icedove.spec -> 1.160
---
 icedove-install.patch | 16 +++++++++++-----
 icedove.spec          | 15 ++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/icedove-install.patch b/icedove-install.patch
index 320efbd..44e08e7 100644
--- a/icedove-install.patch
+++ b/icedove-install.patch
@@ -1,6 +1,6 @@
 --- mozilla/mozilla/toolkit/mozapps/installer/packager.mk.orig	2012-03-13 03:43:47.000000000 +0100
 +++ mozilla/mozilla/toolkit/mozapps/installer/packager.mk	2012-03-24 21:50:54.171788606 +0100
-@@ -708,30 +708,30 @@
+@@ -708,35 +708,35 @@
  endif
  
  stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
@@ -20,6 +20,12 @@
 -	  "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
 +	  "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
  	  "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
+ ifeq (DMG, $(MOZ_PKG_FORMAT))
+ ifeq (dmg, $(filter dmg, $(MOZ_INTERNAL_SIGNING_FORMAT)))
+-	@cd $(DIST)/$(_APPNAME)/Contents && ln -sf _CodeSignature/CodeResources CodeResources
++	@cd $(DESTDIR)/$(_APPNAME)/Contents && ln -sf _CodeSignature/CodeResources CodeResources
+ endif
+ endif
 -	$(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
 +	$(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
  	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
@@ -64,11 +70,11 @@
 --- comm-1.9.1/mail/app/Makefile.in.orig	2009-12-18 14:49:43.990647725 +0100
 +++ comm-1.9.1/mail/app/Makefile.in	2009-12-18 14:49:53.830739781 +0100
 @@ -48,7 +48,7 @@
- GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
- 
  DEFINES += \
--  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \
-+  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" -DAB_CD=$(AB_CD) \
    -DAB_CD=$(AB_CD) \
+   -DAPP_VERSION="$(MOZ_APP_VERSION)" \
+-  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \
++  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" \
    -DGRE_MILESTONE=$(GRE_MILESTONE) \
    -DGRE_BUILDID=$(GRE_BUILDID) \
+    $(NULL)
diff --git a/icedove.spec b/icedove.spec
index 0acb4b6..4b0e378 100644
--- a/icedove.spec
+++ b/icedove.spec
@@ -19,11 +19,11 @@
 %undefine	crashreporter
 %endif
 
-%define		enigmail_ver	1.4.1
+%define		enigmail_ver	1.4.2
 %define		nspr_ver	4.9
 %define		nss_ver		3.13.3
 
-%define		xulrunner_ver	2:12.0
+%define		xulrunner_ver	2:13.0
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -33,14 +33,14 @@
 Summary:	Icedove - email client
 Summary(pl.UTF-8):	Icedove - klient poczty
 Name:		icedove
-Version:	12.0.1
+Version:	13.0
 Release:	1
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2
-# Source0-md5:	64cacde4cb2b1e8736f1c3a0ea6a02db
+# Source0-md5:	0134c67c30e8598f2a64ea004d5bc4bc
 Source1:	http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5:	0eba75fbcf8f0bb32d538df102fbb8e9
+# Source1-md5:	ed608e1cd4cd20b96f7f5afdbf081141
 Source2:	%{name}-branding.tar.bz2
 # Source2-md5:	2da351522bdd7f4a3bd8aaff4c776976
 Source3:	%{name}-rm_nonfree.sh
@@ -55,8 +55,7 @@ Patch5:		%{name}-hunspell.patch
 Patch6:		%{name}-prefs.patch
 Patch7:		system-mozldap.patch
 Patch8:		%{name}-makefile.patch
-# this is only workaround, check if it is fixed with newer firefox
-Patch9:		bug-722975-workaround.patch
+Patch9:		system-cairo.patch
 Patch10:	%{name}-extensiondir.patch
 Patch11:	crashreporter.patch
 Patch12:	no-subshell.patch
@@ -197,9 +196,7 @@ cd mozilla
 %patch6 -p1
 %patch7 -p1
 %patch8 -p2
-cd mozilla
 %patch9 -p1
-cd -
 %patch10 -p2
 %patch11 -p2
 %patch12 -p1
-- 
2.44.0