- up to 17.0.7

[packages/icedove.git] / icedove.spec

diff --git a/icedove.spec b/icedove.spec
index 2417757c041e26d1262210df533b986b008cde12..d72391577a90abd1a65af481dc367950369ba6f3 100644 (file)
--- a/icedove.spec
+++ b/icedove.spec
@@ -19,7 +19,7 @@
 %undefine      crashreporter
 %endif
 
-%define                enigmail_ver    1.5.0
+%define                enigmail_ver    1.5.1
 %define                nspr_ver        4.9.3
 %define                nss_ver         3.14.1
 
@@ -33,14 +33,14 @@
 Summary:       Icedove - email client
 Summary(pl.UTF-8):     Icedove - klient poczty
 Name:          icedove
-Version:       17.0.2
-Release:       2
+Version:       17.0.7
+Release:       1
 License:       MPL 1.1 or GPL v2+ or LGPL v2.1+
-Group:         X11/Applications/Networking
+Group:         X11/Applications/Mail
 Source0:       http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2
-# Source0-md5: 9b7f15fbc672745571d47a3c0e227ca1
+# Source0-md5: 31f07c3911d1d6772831195af64db963
 Source1:       http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5: af4b3534417f32dc201765e4de6ecc86
+# Source1-md5: 3e71f84ed2c11471282412ebe4f5eb2d
 Source2:       %{name}-branding.tar.bz2
 # Source2-md5: 2da351522bdd7f4a3bd8aaff4c776976
 Source3:       %{name}-rm_nonfree.sh
@@ -48,7 +48,6 @@ Source4:      %{name}.desktop
 Source5:       %{name}.sh
 Patch0:                %{name}-branding.patch
 Patch1:                %{name}-enigmail-shared.patch
-Patch2:                %{name}-system-xulrunner.patch
 Patch3:                %{name}-fonts.patch
 Patch4:                %{name}-install.patch
 Patch5:                %{name}-hunspell.patch
@@ -61,6 +60,7 @@ Patch11:      crashreporter.patch
 Patch12:       no-subshell.patch
 # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
 Patch13:       system-virtualenv.patch
+Patch14:       gyp-slashism.patch
 URL:           http://www.pld-linux.org/Packages/Icedove
 BuildRequires: GConf2-devel >= 1.2.1
 BuildRequires: alsa-lib-devel
@@ -99,6 +99,7 @@ BuildRequires:        yasm
 BuildRequires: zip
 %if %{with xulrunner}
 BuildRequires: xulrunner-devel >= %{xulrunner_ver}
+BuildRequires: xulrunner-devel < 2:18
 %else
 Requires:      myspell-common
 Requires:      nspr >= 1:%{nspr_ver}
@@ -189,14 +190,13 @@ Główne możliwości:
 
 %prep
 %setup -qc
-mv comm-release mozilla
+mv comm-esr17 mozilla
 %setup -q -T -D -a2
 cd mozilla
 %{?with_enigmail:%{__gzip} -dc %{SOURCE1} | %{__tar} -xf - -C mailnews/extensions}
 /bin/sh %{SOURCE3}
 %patch0 -p1
 %{?with_enigmail:%patch1 -p1}
-%{?with_xulrunner:%patch2 -p1}
 %patch3 -p1
 %patch4 -p1
 %patch6 -p1
@@ -207,6 +207,7 @@ cd mozilla
 %patch11 -p2
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 cd mozilla
@@ -492,6 +493,7 @@ exit 0
 %attr(755,root,root) %{_libdir}/%{name}/icedove
 %attr(755,root,root) %{_libdir}/%{name}/register
 %if %{without xulrunner}
+%{_libdir}/%{name}/dependentlibs.list
 %{_libdir}/%{name}/platform.ini
 %{_libdir}/%{name}/greprefs.js
 %attr(755,root,root) %{_libdir}/%{name}/components/*.so