SPECS: mozilla-thunderbird.spec - use system myspell and dictionaries

Mon Mar 5 02:14:25 CET 2007

Author: glen                         Date: Mon Mar  5 01:14:25 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use system myspell and dictionaries

---- Files affected:
SPECS:
   mozilla-thunderbird.spec (1.90 -> 1.91) 

---- Diffs:

================================================================
Index: SPECS/mozilla-thunderbird.spec
diff -u SPECS/mozilla-thunderbird.spec:1.90 SPECS/mozilla-thunderbird.spec:1.91

--- SPECS/mozilla-thunderbird.spec:1.90	Wed Feb 28 00:33:25 2007
+++ SPECS/mozilla-thunderbird.spec	Mon Mar  5 02:14:20 2007
@@ -5,11 +5,10 @@
 #
 # Conditional builds
 %bcond_without	enigmail    # don't build enigmail - GPG/PGP support
-%bcond_without	spellcheck  # build without spellcheck function
 %bcond_without	ldap	    # disable e-mail address lookups in LDAP directories
 #
 %define		_rc		b2
-%define		_rel	2.9
+%define		_rel	2.10
 Summary:	Thunderbird Community Edition - email client
 Summary(pl.UTF-8):	Thunderbird Community Edition - klient poczty
 Name:		mozilla-thunderbird
@@ -25,7 +24,6 @@
 Source3:	%{name}.sh
 Source4:	%{name}-enigmail.manifest
 Source5:	%{name}.png
-Patch0:		%{name}-nss.patch
 Patch1:		%{name}-lib_path.patch
 Patch3:		%{name}-nopangoxft.patch
 Patch4:		%{name}-enigmail-shared.patch
@@ -36,6 +34,7 @@
 # https://bugzilla.mozilla.org/show_bug.cgi?id=362462
 Patch7:		mozilla-hack-gcc_4_2.patch
 Patch8:		%{name}-install.patch
+Patch9:		mozilla-firefox-myspell.patch
 URL:		http://www.mozilla.org/projects/thunderbird/
 BuildRequires:	automake
 BuildRequires:	freetype-devel >= 1:2.1.8
@@ -44,6 +43,7 @@
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libpng-devel >= 1.2.0
 BuildRequires:	libstdc++-devel
+BuildRequires:	myspell-devel
 BuildRequires:	nspr-devel >= 1:4.6.1
 BuildRequires:	nss-devel >= 1:3.11.3
 BuildRequires:	pango-devel >= 1:1.1.0
@@ -54,14 +54,12 @@
 BuildRequires:	xorg-lib-libXp-devel
 BuildRequires:	xorg-lib-libXt-devel
 %if %{with enigmail}
-BuildRequires:	/bin/csh
-BuildRequires:	/bin/ex
+#BuildRequires:	/bin/csh
+#BuildRequires:	/bin/ex
 %endif
 Requires:	nspr >= 1:4.6.1
 Requires:	nss >= 1:3.11.3
-%if %{with spellcheck}
-Provides:	mozilla-thunderbird-spellcheck
-%endif
+Obsoletes:	mozilla-thunderbird-dictionary-en-US
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # mozilla and thunderbird provide their own versions
@@ -76,28 +74,10 @@
 Thunderbird Community Edition jest open sourcowym, szybkim i
 przenośnym klientem poczty.
 
-%package dictionary-en-US
-Summary:	English (US) dictionary for spellchecking
-Summary(pl.UTF-8):	Angielski (USA) słownik do sprawdzania pisowni
-Group:		Applications/Dictionaries
-Requires:	mozilla-thunderbird-spellcheck
-
-%description dictionary-en-US
-This package contains English (US) myspell-compatible dictionary used
-for spellcheck function of Thunderbird Community Edition. An
-alternative for this can be the OpenOffice's dictionary.
-
-%description dictionary-en-US -l pl.UTF-8
-Ten pakiet zawiera angielski (USA) słownik kompatybilny z myspellem,
-używany przez funkcję sprawdzania pisowni w Thunderbird Community
-Edition. Alternatywą dla niego może być słownik OpenOffice'a.
-
 %prep
 %setup -q -c -n %{name}-%{version}%{_rc}
 cd mozilla
 %{?with_enigmail:tar xvfz %{SOURCE1} -C mailnews/extensions}
-
-#%patch0 -p1
 %patch1 -p1
 %patch3 -p1
 %{?with_enigmail:%patch4 -p1}
@@ -105,6 +85,7 @@
 %patch6 -p1
 %patch7 -p2
 %patch8 -p1
+%patch9 -p1
 
 :> config/gcc_hidden.h
 
@@ -157,7 +138,7 @@
 ac_add_options --enable-canvas
 ac_add_options --enable-crypto
 ac_add_options --enable-default-toolkit="gtk2"
-ac_add_options --enable-extensions="pref,cookie,wallet%{?with_spellcheck:,spellcheck}"
+ac_add_options --enable-extensions="pref,cookie,wallet,spellcheck"
 ac_add_options --enable-mathml
 ac_add_options --enable-optimize="%{rpmcflags}"
 ac_add_options --enable-pango
@@ -165,6 +146,7 @@
 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-svg
 ac_add_options --enable-xft
 ac_add_options --enable-xinerama
@@ -203,7 +185,6 @@
 # move arch independant ones to datadir
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries $RPM_BUILD_ROOT%{_datadir}/%{name}/dictionaries
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/init.d $RPM_BUILD_ROOT%{_datadir}/%{name}/init.d
@@ -211,13 +192,15 @@
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
 ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
 ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults
-ln -s ../../share/%{name}/dictionaries $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs
 ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons
 ln -s ../../share/%{name}/init.d $RPM_BUILD_ROOT%{_libdir}/%{name}/init.d
 ln -s ../../share/%{name}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp
 ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
 
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
+ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
+
 %{__sed} -e 's, at LIBDIR@,%{_libdir},' %{SOURCE3} > $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird
 ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/thunderbird
 
@@ -253,7 +236,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-for d in chrome defaults dictionaries greprefs icons init.d isp res; do
+if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then
+	mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave}
+fi
+for d in chrome defaults greprefs icons init.d isp res; do
 	if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then
 		install -d %{_datadir}/%{name}
 		mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d
@@ -298,7 +284,6 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/chrome
 %{_datadir}/%{name}/defaults
-%dir %{_datadir}/%{name}/dictionaries
 %{_datadir}/%{name}/greprefs
 %{_datadir}/%{name}/icons
 %{_datadir}/%{name}/init.d
@@ -311,19 +296,15 @@
 %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}
 %endif
 
-%if %{with spellcheck}
-%files dictionary-en-US
-%defattr(644,root,root,755)
-%{_datadir}/%{name}/dictionaries/en-US.dic
-%{_datadir}/%{name}/dictionaries/en-US.aff
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2007/03/05 01:14:20  glen
+- use system myspell and dictionaries
+
 Revision 1.90  2007/02/27 23:33:25  glen
 - libgfxpsshar.so, libxpistub.so added to _noautoreqdep (firefox has those libs too)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozilla-thunderbird.spec?r1=1.90&r2=1.91&f=u

