packages: icedove/icedove.spec - fixed hunspell, dropped obsolete myspell, ...

[hawk]

Author: hawk                         Date: Sat Feb 13 13:58:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed hunspell, dropped obsolete myspell, package icon, cleaned up files
- works for me, release 1

---- Files affected:
packages/icedove:
   icedove.spec (1.61 -> 1.62) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.61 packages/icedove/icedove.spec:1.62
--- packages/icedove/icedove.spec:1.61	Sat Feb 13 12:28:09 2010
+++ packages/icedove/icedove.spec	Sat Feb 13 14:58:13 2010
@@ -2,9 +2,6 @@
 #
 # TODO:
 # - separate spec for enigmail
-# - remove -myspell.patch
-# - package unpackaged files
-# - fix hunspell and enable
 #
 # Conditional builds
 %bcond_without	enigmail	# don't build enigmail - GPG/PGP support
@@ -24,7 +21,7 @@
 Summary(pl.UTF-8):	Icedove - klient poczty
 Name:		icedove
 Version:	3.0.1
-Release:	0.4
+Release:	1
 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
@@ -42,7 +39,7 @@
 Patch2:		%{name}-gcc.patch
 Patch3:		%{name}-fonts.patch
 Patch4:		%{name}-install.patch
-Patch5:		%{name}-myspell.patch
+Patch5:		%{name}-hunspell.patch
 Patch6:		%{name}-prefs.patch
 Patch7:		%{name}-breakpad.patch
 Patch8:		%{name}-libpng.patch
@@ -53,7 +50,7 @@
 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:	hunspell-devel
 BuildRequires:	libIDL-devel >= 0.8.0
 %{?with_gnomevfs:BuildRequires:	libgnome-devel >= 2.0}
 %{?with_gnomeui:BuildRequires:	libgnomeui-devel >= 2.2.0}
@@ -156,7 +153,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-#%patch5 -p1
+%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -247,7 +244,7 @@
 ac_add_options --disable-strip
 ac_add_options --disable-strip-libs
 ac_add_options --enable-system-cairo
-#ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-hunspell
 ac_add_options --enable-svg
 ac_add_options --enable-xft
 ac_add_options --enable-application=mail
@@ -296,13 +293,11 @@
 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}/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}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
 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}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs
-#ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons
 ln -s ../../share/%{name}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp
 ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
 
@@ -370,31 +365,24 @@
 %attr(755,root,root) %{_libdir}/%{name}/*.sh
 %attr(755,root,root) %{_libdir}/%{name}/*-bin
 %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
-#%attr(755,root,root) %{_libdir}/%{name}/reg*
 %attr(755,root,root) %{_libdir}/%{name}/icedove
-#%{_libdir}/%{name}/*.txt
-#%attr(755,root,root) %{_libdir}/%{name}/x*
 
 # symlinks
 %{_libdir}/%{name}/chrome
 %{_libdir}/%{name}/defaults
 %{_libdir}/%{name}/dictionaries
 %{_libdir}/%{name}/greprefs
-#%{_libdir}/%{name}/icons
 %{_libdir}/%{name}/isp
 %{_libdir}/%{name}/res
 
 %{_libdir}/%{name}/dependentlibs.list
-#%{_libdir}/%{name}/updater
-#%{_libdir}/%{name}/update.locale
-#%{_pixmapsdir}/*.png
+%{_pixmapsdir}/*.png
 %{_desktopdir}/*.desktop
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/chrome
 %{_datadir}/%{name}/defaults
 %{_datadir}/%{name}/greprefs
-#%{_datadir}/%{name}/icons
 %{_datadir}/%{name}/isp
 %{_datadir}/%{name}/res
 
@@ -427,6 +415,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2010/02/13 13:58:13  hawk
+- fixed hunspell, dropped obsolete myspell, package icon, cleaned up files
+- works for me, release 1
+
 Revision 1.61  2010/02/13 11:28:09  hawk
 - doh, lightning was moved to separate package not spec
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.61&r2=1.62&f=u