- doh, one more s/Thunderbird/Icedove/

[packages/icedove.git] / icedove.spec

diff --git a/icedove.spec b/icedove.spec
index ac656479ef69f5af029217067fe5c46ca35b0336..28624e7877b9a59f823e560dc6d54a3e0bd4401d 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
@@ -14,13 +15,12 @@
 %undefine      with_gnomevfs
 %endif
 %define                enigmail_ver            0.95.6
-%define                thunderbird_ver         2.0.0.14
 
 Summary:       Icedove - email client
 Summary(pl.UTF-8):     Icedove - klient poczty
 Name:          icedove
-Version:       %{thunderbird_ver}
-Release:       1
+Version:       2.0.0.14
+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
@@ -41,6 +41,7 @@ Patch4:               %{name}-fonts.patch
 Patch5:                %{name}-install.patch
 Patch6:                %{name}-myspell.patch
 Patch7:                %{name}-regionNames.patch
+Patch8:                %{name}-prefs.patch
 URL:           http://www.mozilla.org/projects/thunderbird/
 %{?with_gnomevfs:BuildRequires:        GConf2-devel >= 1.2.1}
 BuildRequires: automake
@@ -90,7 +91,7 @@ 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}
 
 %description addon-enigmail
 Enigmail is an extension to the Icedove mail client which allows users
@@ -120,8 +121,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 +133,7 @@ cd mozilla
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 :> config/gcc_hidden.h