- rel. 2

[packages/thunderbird.git] / icedove.spec

diff --git a/icedove.spec b/icedove.spec
index ac656479ef69f5af029217067fe5c46ca35b0336..2a40de587bc38e8ef1ed004a45ce798442f7e85d 100644 (file)
--- a/icedove.spec
+++ b/icedove.spec
@@ -1,6 +1,7 @@
+#
 # TODO:
-# - CHECK all features of enigmail
-# - separate spec for enigmail
+#   - CHECK all features of enigmail
+#   - separate spec for enigmail
 #
 # Conditional builds
 %bcond_without enigmail        # don't build enigmail - GPG/PGP support
@@ -13,20 +14,19 @@
 %undefine      with_gnomeui
 %undefine      with_gnomevfs
 %endif
-%define                enigmail_ver            0.95.6
-%define                thunderbird_ver         2.0.0.14
+%define                enigmail_ver            0.95.7
 
 Summary:       Icedove - email client
 Summary(pl.UTF-8):     Icedove - klient poczty
 Name:          icedove
-Version:       %{thunderbird_ver}
-Release:       1
+Version:       2.0.0.21
+Release:       2
 License:       MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:         Applications/Networking
 Source0:       http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}-source.tar.bz2
-# Source0-md5: e304510d08f7e226bbfff8e7e549232f
+# Source0-md5: 55e24753a7ccf2fbf0272987dd4bb086
 Source1:       http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5: cfbe6ff77f80a349b396829757ad952a
+# Source1-md5: bbee59bab58b97e33e85015a5ae5de7b
 Source2:       %{name}-branding.tar.bz2
 # Source2-md5: e775b8cb658de32f30b403bc9b7950bf
 Source3:       %{name}-rm_nonfree.sh
@@ -41,7 +41,8 @@ Patch4:               %{name}-fonts.patch
 Patch5:                %{name}-install.patch
 Patch6:                %{name}-myspell.patch
 Patch7:                %{name}-regionNames.patch
-URL:           http://www.mozilla.org/projects/thunderbird/
+Patch8:                %{name}-prefs.patch
+URL:           http://www.pld-linux.org/Packages/Icedove
 %{?with_gnomevfs:BuildRequires:        GConf2-devel >= 1.2.1}
 BuildRequires: automake
 BuildRequires: freetype-devel >= 1:2.1.8
@@ -70,6 +71,8 @@ Obsoletes:    mozilla-thunderbird
 Obsoletes:     mozilla-thunderbird-dictionary-en-US
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                filterout_cpp           -D_FORTIFY_SOURCE=[0-9]+
+
 # iceweasel/icedove/iceape provide their own versions
 %define                _noautoreqdep           libgfxpsshar.so libgkgfx.so libgtkxtbin.so libjsj.so libxpcom_compat.so libxpcom_core.so libxpistub.so
 %define                _noautoprovfiles        %{_libdir}/%{name}/components
@@ -90,7 +93,8 @@ Summary(pl.UTF-8):    Rozszerzenie do uwierzytelniania i szyfrowania zapewnianego p
 License:       MPL/LGPL
 Group:         Applications/Networking
 URL:           http://enigmail.mozdev.org/
-Requires:      %{name} = %{thunderbird_ver}-%{release}
+Requires:      %{name} = %{version}-%{release}
+Obsoletes:     mozilla-thunderbird-addon-enigmail
 
 %description addon-enigmail
 Enigmail is an extension to the Icedove mail client which allows users
@@ -120,8 +124,7 @@ Główne możliwości:
 - interfejs do zarządzania kluczami OpenPGP
 
 %prep
-%setup -q -c
-tar xvfj %{SOURCE2}
+%setup -q -c -a2
 cd mozilla
 %{?with_enigmail:tar xvfz %{SOURCE1} -C mailnews/extensions}
 /bin/sh %{SOURCE3}
@@ -133,6 +136,7 @@ cd mozilla
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 :> config/gcc_hidden.h