X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=icedove.spec;h=d6c02164418ee829d7846babb9a3f2070f40f8e7;hb=9fb0198f78a7865c998c66ab644f96be4db23f9a;hp=184f83e8160e9353523d6390aed4b1066aa1d5e9;hpb=fb843e2489a4c2cd10d5a644f102cb656d90b780;p=packages%2Fthunderbird.git

diff --git a/icedove.spec b/icedove.spec
index 184f83e..d6c0216 100644
--- 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
@@ -46,19 +47,20 @@ 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
@@ -66,9 +68,7 @@ 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
@@ -145,6 +145,7 @@ cd comm-1.9.1
 %patch6 -p0
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 cd comm-1.9.1
@@ -231,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