- updated to 17.0, enigmail 1.4.6

diff --git a/icedove-install.patch b/icedove-install.patch
index a45e2936915d9f959b763b5fc7dc1761a9768c68..e819c9c6c8bd8a5f5faf0a86f94456a20d217492 100644 (file)
--- 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,37 +708,37 @@
+@@ -708,41 +708,41 @@
  endif
  
  stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
@@ -43,6 +43,12 @@
 -        $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
 +        $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
          $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
+ ifdef MOZ_WEBAPP_RUNTIME
+-      mv $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
+-      sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
++      mv $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
++      sed 's/$(AB_CD)/localized/' $(DESTDIR)/bin/webapprt/chrome.manifest > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
+ endif
 -      printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
 +      printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
  else # !MOZ_PKG_MANIFEST

diff --git a/icedove.spec b/icedove.spec
index b7e49c35bb39e0a789a72bf5856503e729644ced..ef016babd51b11e3bd3b01eb7abe430cff710e2a 100644 (file)
--- a/icedove.spec
+++ b/icedove.spec
@@ -19,7 +19,7 @@
 %undefine      crashreporter
 %endif
 
-%define                enigmail_ver    1.4.4
+%define                enigmail_ver    1.4.6
 %define                nspr_ver        4.9
 %define                nss_ver         3.13.3
 
@@ -33,14 +33,14 @@
 Summary:       Icedove - email client
 Summary(pl.UTF-8):     Icedove - klient poczty
 Name:          icedove
-Version:       15.0
-Release:       1
+Version:       17.0
+Release:       0.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: e41f88ca2fd0c9bc608aa2c145b3bc2c
+# Source0-md5: f3690660044337273efb52f79cb15b0e
 Source1:       http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5: 1bc36b5077f6b01b6acf0f75565dddc8
+# Source1-md5: 3d42cff27e0f8da24bdabf8363d8261f
 Source2:       %{name}-branding.tar.bz2
 # Source2-md5: 2da351522bdd7f4a3bd8aaff4c776976
 Source3:       %{name}-rm_nonfree.sh

diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index bc76d83ed24a87a04c277dca6014db996bd16598..a69cd1a28f7a10c860756adc5130bced67a80432 100644 (file)
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -6,7 +6,7 @@ Restore --system-site-packages when system virtualenv gets 1.7 upgrade
  AC_MSG_RESULT([Creating Python virtualenv])
  rm -rf _virtualenv
  mkdir -p _virtualenv
--MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
 +MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
  case "$host_os" in
  mingw*)
@@ -17,7 +17,7 @@ Restore --system-site-packages when system virtualenv gets 1.7 upgrade
  echo "$ac_t""Creating Python virtualenv" 1>&6
  rm -rf _virtualenv
  mkdir -p _virtualenv
--MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
 +MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
  case "$host_os" in
  mingw*)