- added -condstore.patch to fix annoying bug, see https://bugzilla.mozilla.org/show_b...

[packages/thunderbird.git] / icedove.spec

diff --git a/icedove.spec b/icedove.spec
index e8e7ebb54f2deea59fc1f26be1a0fdb87e065562..d6c02164418ee829d7846babb9a3f2070f40f8e7 100644 (file)
--- a/icedove.spec
+++ b/icedove.spec
@@ -2,9 +2,10 @@
 # TODO:
 # - CHECK all features of enigmail
 # - separate spec for enigmail
-# - update or remove -myspell.patch
+# - remove -myspell.patch
 # - package unpackaged files
 # - update branding patch!!!
+# - fix hunspell and enable
 #
 # Conditional builds
 %bcond_without enigmail        # don't build enigmail - GPG/PGP support
@@ -23,12 +24,12 @@
 Summary:       Icedove - email client
 Summary(pl.UTF-8):     Icedove - klient poczty
 Name:          icedove
-Version:       3.0
+Version:       3.0.1
 Release:       0.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: 9a564ac2489b1b0f9348dc298b913f6c
+# Source0-md5: f004aa5ddf2a30b5df96e06df416b0c9
 Source1:       http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
 # Source1-md5: e3a6d379f1a72ac023751bdde2de750a
 Source2:       %{name}-branding.tar.bz2
@@ -45,28 +46,31 @@ Patch4:             %{name}-install.patch
 Patch5:                %{name}-myspell.patch
 Patch6:                %{name}-prefs.patch
 Patch7:                %{name}-breakpad.patch
+Patch8:                %{name}-libpng.patch
+Patch9:                %{name}-condstore.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
 %{?with_gnomevfs:BuildRequires:        gnome-vfs2-devel >= 2.0}
 BuildRequires: gtk+2-devel >= 1:2.0.0
+#BuildRequires:        hunspell-devel
 BuildRequires: libIDL-devel >= 0.8.0
 %{?with_gnomevfs:BuildRequires:        libgnome-devel >= 2.0}
 %{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0}
 BuildRequires: libjpeg-devel >= 6b
 BuildRequires: libpng-devel >= 1.2.0
 BuildRequires: libstdc++-devel
-BuildRequires: myspell-devel
 BuildRequires: nspr-devel >= 1:4.8
 BuildRequires: nss-devel >= 1:3.12.0
 BuildRequires: pango-devel >= 1:1.1.0
+BuildRequires: pkgconfig
 BuildRequires: sed >= 4.0
+BuildRequires: startup-notification-devel >= 0.8
 BuildRequires: xorg-lib-libXext-devel
-BuildRequires: xorg-lib-libXft-devel >= 2.1
 BuildRequires: xorg-lib-libXinerama-devel
-BuildRequires: xorg-lib-libXp-devel
 BuildRequires: xorg-lib-libXt-devel
+BuildRequires: zip
 Requires:      myspell-common
 Requires:      nspr >= 1:4.6.1
 Requires:      nss >= 1:3.11.3
@@ -132,7 +136,7 @@ Główne możliwości:
 cd comm-1.9.1
 %{?with_enigmail:tar xvfz %{SOURCE1} -C mailnews/extensions}
 /bin/sh %{SOURCE3}
-%patch0 -p1
+%patch0 -p2
 %{?with_enigmail:%patch1 -p1}
 %patch2 -p1
 %patch3 -p1
@@ -140,6 +144,8 @@ cd comm-1.9.1
 #%patch5 -p1
 %patch6 -p0
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 cd comm-1.9.1
@@ -226,7 +232,7 @@ ac_add_options --enable-static
 ac_add_options --disable-strip
 ac_add_options --disable-strip-libs
 ac_add_options --enable-system-cairo
-ac_add_options --enable-system-myspell
+#ac_add_options --enable-system-hunspell
 ac_add_options --enable-svg
 ac_add_options --enable-xft
 ac_add_options --enable-application=mail
@@ -386,6 +392,7 @@ exit 0
 
 %dir %{_libdir}/%{name}/extensions
 %{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
 
 %if %{with enigmail}
 %files addon-enigmail