packages: icedove/icedove.spec - started update to 3.0 - updated engmail to...

[paszczus]

Author: paszczus                     Date: Thu Dec 17 07:39:23 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- started update to 3.0
- updated engmail to 1.0.0
- updated BRs
- updated ac_add_options
- patches NOT updated
- release 0.1

---- Files affected:
packages/icedove:
   icedove.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.31 packages/icedove/icedove.spec:1.32
--- packages/icedove/icedove.spec:1.31	Thu Sep 17 20:55:30 2009
+++ packages/icedove/icedove.spec	Thu Dec 17 08:39:17 2009
@@ -11,19 +11,19 @@
 %undefine	with_gnomeui
 %undefine	with_gnomevfs
 %endif
-%define		enigmail_ver		0.96.0
+%define		enigmail_ver		1.0.0
 
 Summary:	Icedove - email client
 Summary(pl.UTF-8):	Icedove - klient poczty
 Name:		icedove
-Version:	2.0.0.23
-Release:	4
+Version:	3.0
+Release:	0.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
-# Source0-md5:	2e118fcf752ee60ce994f1471f9632d1
+Source0:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2
+# Source0-md5:	9a564ac2489b1b0f9348dc298b913f6c
 Source1:	http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5:	cf8c38e8d33965706df383ab33b3923c
+# Source1-md5:	e3a6d379f1a72ac023751bdde2de750a
 Source2:	%{name}-branding.tar.bz2
 # Source2-md5:	e775b8cb658de32f30b403bc9b7950bf
 Source3:	%{name}-rm_nonfree.sh
@@ -53,8 +53,8 @@
 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:	nspr-devel >= 1:4.8
+BuildRequires:	nss-devel >= 1:3.12.0
 BuildRequires:	pango-devel >= 1:1.1.0
 BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libXext-devel
@@ -123,33 +123,33 @@
 
 %prep
 %setup -q -c -a2
-cd mozilla
+cd comm-1.9.1
 %{?with_enigmail:tar xvfz %{SOURCE1} -C mailnews/extensions}
 /bin/sh %{SOURCE3}
-%patch0 -p1
-%patch1 -p1
+##%patch0 -p1
+##%patch1 -p1
 %{?with_enigmail:%patch2 -p1}
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+##%patch3 -p1
+#%patch4 -p1
+#%patch5 -p1
+#%patch6 -p1
+#%patch7 -p1
+#%patch8 -p1
+#%patch9 -p1
 
-:> config/gcc_hidden.h
+##:> config/gcc_hidden.h
 
 %build
-cd mozilla
+cd comm-1.9.1
 export CFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
 export CXXFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
 
-cp -f %{_datadir}/automake/config.* build/autoconf
-cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
+cp -f %{_datadir}/automake/config.* mozilla/build/autoconf
+cp -f %{_datadir}/automake/config.* mozilla/nsprpub/build/autoconf
 cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
 
 cat << 'EOF' > .mozconfig
-. $topsrcdir/mail/config/mozconfig
+#. $topsrcdir/mail/config/mozconfig
 
 ac_add_options --prefix=%{_prefix}
 ac_add_options --exec-prefix=%{_exec_prefix}
@@ -194,10 +194,11 @@
 ac_add_options --disable-installer
 ac_add_options --disable-jsd
 ac_add_options --disable-xprint
+ac_add_options --disable-permissions
+ac_add_options --disable-pref-extensions
 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,spellcheck"
 ac_add_options --enable-mathml
 ac_add_options --enable-optimize="%{rpmcflags}"
 ac_add_options --enable-pango
@@ -208,6 +209,8 @@
 ac_add_options --enable-system-myspell
 ac_add_options --enable-svg
 ac_add_options --enable-xft
+ac_add_options --enable-application=mail
+ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-xinerama
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-nspr
@@ -368,6 +371,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2009/12/17 07:39:17  paszczus
+- started update to 3.0
+- updated engmail to 1.0.0
+- updated BRs
+- updated ac_add_options
+- patches NOT updated
+- release 0.1
+
 Revision 1.31  2009/09/17 18:55:30  hawk
 - release 4
 
@@ -413,8 +424,8 @@
 
 Revision 1.20  2008/12/31 16:13:13  duddits
 - up to 2.0.0.19, fixes CVE-2008-5500, CVE-2008-5501, CVE-2008-5502,
-CVE-2008-5503, CVE-2008-5506, CVE-2008-5507, CVE-2008-5508,
-CVE-2008-5510, CVE-2008-5511, CVE-2008-5512
+  CVE-2008-5503, CVE-2008-5506, CVE-2008-5507, CVE-2008-5508,
+  CVE-2008-5510, CVE-2008-5511, CVE-2008-5512
 
 Revision 1.19  2008/12/18 18:47:34  hawk
 - updated to 2.0.0.18, fixes CVE-2008-5012, CVE-2008-5014, CVE-2008-5016,
================================================================

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