- up to 3.0.1

[packages/thunderbird.git] / icedove.spec

diff --git a/icedove.spec b/icedove.spec
index 056a879e1997f1e72cf530434a23244041dc4c33..27814de3a5a112680b9ca313afeacf6a282fdac0 100644 (file)
--- a/icedove.spec
+++ b/icedove.spec
@@ -12,6 +12,7 @@
 %bcond_without gnomevfs        # disable GNOME comp. (gconf+libgnome+gnomevfs) and gnomevfs ext.
 %bcond_without gnome           # disable all GNOME components (gnome+gnomeui+gnomevfs)
 %bcond_without ldap            # disable e-mail address lookups in LDAP directories
+%bcond_without  lightning   # disable sunbird calendar
 #
 %if %{without gnome}
 %undefine      with_gnomeui
@@ -22,12 +23,12 @@
 Summary:       Icedove - email client
 Summary(pl.UTF-8):     Icedove - klient poczty
 Name:          icedove
-Version:       3.0
-Release:       0.2
+Version:       3.0.1
+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: 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
@@ -96,6 +97,7 @@ License:      MPL/LGPL
 Group:         Applications/Networking
 URL:           http://enigmail.mozdev.org/
 Requires:      %{name} = %{version}-%{release}
+Requires:      gnupg
 Obsoletes:     mozilla-thunderbird-addon-enigmail
 
 %description addon-enigmail
@@ -130,7 +132,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
@@ -197,16 +199,17 @@ ac_add_options --enable-ldap
 %else
 ac_add_options --disable-ldap
 %endif
-ac_add_options --disable-elf-dynstr-gc
 ac_add_options --disable-crashreporter
-ac_add_options --disable-pedantic
 ac_add_options --disable-updater
 ac_add_options --disable-xterm-updates
 ac_add_options --enable-ldap
 ac_add_options --enable-postscript
-ac_add_options --enable-old-abi-compat-wrappers
 ac_add_options --enable-startup-notification
+%if %{with lightning}
 ac_add_options --enable-calendar
+%else
+ac_add_options --disable-calendar
+%endif
 ac_add_options --disable-installer
 ac_add_options --disable-jsd
 ac_add_options --disable-xprint
@@ -243,17 +246,17 @@ ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
 EOF
 
 %{__make} -j1 -f client.mk build \
-    STRIP="/bin/true" \
-    CC="%{__cc}" \
+       STRIP="/bin/true" \
+       CC="%{__cc}" \
        CXX="%{__cxx}"
 
 %if %{with enigmail}
 cd mailnews/extensions/enigmail
-./makemake -r 
+./makemake -r
 %{__make} -C ../../../obj-%{_target_cpu}/mailnews/extensions/enigmail \
-    STRIP="/bin/true" \
-    CC="%{__cc}" \
-    CXX="%{__cxx}"
+       STRIP="/bin/true" \
+       CC="%{__cc}" \
+       CXX="%{__cxx}"
 %endif
 
 %install
@@ -297,10 +300,8 @@ install -d $_enig_dir/chrome
 install -d $_enig_dir/components
 install -d $_enig_dir/defaults/preferences
 mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmail.jar $_enig_dir/chrome
-#mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmail-skin-seamonkey.jar $_enig_dir/chrome
 mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/enig* $_enig_dir/components
 mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/libenigmime.so $_enig_dir/components
-#mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/libipc.so $_enig_dir/components
 mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/ipc.xpt $_enig_dir/components
 mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults/preferences/enigmail.js $_enig_dir/defaults/preferences
 cp -f mailnews/extensions/enigmail/package/install.rdf $_enig_dir
@@ -385,6 +386,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