update to 24.6.0 [release 24.6.0-1mamba;Tue Jun 17 2014]

thunderbird.spec

@@ -5,10 +5,10 @@
 %define        tbdir                       %{_libdir}/thunderbird-%{thunderbird_internal}
 #%define        enable_debug_info           0
 #%define        build_langpack              1
-%define        with_calendar               1
+#%define        with_calendar               0
 
 Name:          thunderbird
-Version:       17.0.8
+Version:       24.6.0
 Release:       1mamba
 Summary:       Mozilla Thunderbird email, RSS, and newsgroup client
 Group:         Graphical Desktop/Applications/Internet
@@ -25,7 +25,7 @@ Source1:       thunderbird-%{version}-langpacks.tar.bz2
 Source2:       thunderbird.desktop
 Source3:       mozilla-thunderbird128x128.png
 Source4:       thunderbird-script
-Source5:       thunderbird-lang.sh 
+Source5:       thunderbird-autoupdate
 #ftp://ftp.mozilla.org/pub/calendar/lightning/nightly/2011/03/2011-03-21-03-comm-1.9.2-l10n/linux-xpi/lightning-it.xpi
 #http://l10n.mozilla.org/~hubert/pub/calendar/lightning/nightly/latest-comm-1.9.2-l10n/locales/it/
 Source6:       gdata-provider-it.jar
@@ -240,10 +240,9 @@ This package contains static libraries and header files need for development.
 
 %prep
 %setup -q -c
-mv comm-*/* .
-
 #-D -T
-#:<< __EOF
+#:<< ___EOF
+mv comm-*/* .
 
 %define _use_internal_dependency_generator 0
 
@@ -314,7 +313,7 @@ ac_add_options --libdir=%{_libdir}
 ac_add_options --includedir=%{_includedir}
 ac_add_options --mandir=%{_mandir}
 ac_add_options --with-default-mozilla-five-home=%{tbdir}
-%if %with_calendar
+%if "%{?with_calendar}"
 ac_add_options --enable-calendar
 %endif
 #ac_add_options --with-libxul-sdk=%{xul_sdk_dir}
@@ -408,7 +407,9 @@ export MAKE="gmake %{makeflags}"
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 
-make -f client.mk build
+make -f client.mk build \
+   NSS_LIBS="`pkg-config --libs nss` -lcrmf" \
+   NSS_CFLAGS="`pkg-config --cflags nss`"
 # SDK_BIN_DIR=%{xul_sdk_dir}/sdk/bin/
 # -f client.mk build
 
@@ -495,11 +496,9 @@ touch %{buildroot}%{tbdir}/components/xpti.dat
 
 mkdir -p %{buildroot}%{_libdir}/mozilla/plugins
 
-cd mozilla
+install -c -m 644 mozilla/LICENSE %{buildroot}%{tbdir}
-install -c -m 644 LICENSE %{buildroot}%{tbdir}
-cd -
 
-%if %with_calendar
+%if %{?with_calendar}
 mkdir -p %{buildroot}%{tbdir}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
 unzip -q -u objdir-tb/mozilla/dist/xpi-stage/lightning.xpi -d %{buildroot}%{tbdir}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
 cp -pr %{SOURCE7} %{buildroot}%{tbdir}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/
@@ -552,26 +551,26 @@ fi
 %dir %{tbdir}/chrome/icons/default
 %{tbdir}/chrome/icons/default/default*.png
 %dir %{tbdir}/components
-%ghost %{tbdir}/components/binary.manifest
 %ghost %{tbdir}/components/compreg.dat
 %ghost %{tbdir}/components/xpti.dat
 %{tbdir}/components/lib*.so
+%{tbdir}/components/components.manifest
 %dir %{tbdir}/defaults
 %dir %{tbdir}/defaults/messenger
 %{tbdir}/defaults/messenger/mailViews.dat
 %{tbdir}/defaults/pref/*.js
 %{tbdir}/dependentlibs.list
-%dir %{tbdir}/distribution
+#%dir %{tbdir}/distribution
-%dir %{tbdir}/distribution/extensions
+#%dir %{tbdir}/distribution/extensions
-%{tbdir}/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
+#%{tbdir}/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
 %dir %{tbdir}/dictionaries
 %{tbdir}/dictionaries/*
 %dir %{tbdir}/extensions
 %{tbdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-%if %with_calendar
+#%if "%{?with_calendar}"
-%{tbdir}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
+#%{tbdir}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
-%{tbdir}/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
+#%{tbdir}/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
-%endif
+#%endif
 #%dir %{tbdir}/hyphenation
 #%{tbdir}/hyphenation/hyph*.dic
 %dir %{tbdir}/icons
@@ -591,7 +590,7 @@ fi
 %{tbdir}/searchplugins/*
 %dir %{_datadir}/idl/thunderbird-%{majversion}
 %{_datadir}/idl/thunderbird-%{majversion}/*
-%{_datadir}/idl/thunderbird-%{majversion}/.mkdir.done
+#%{_datadir}/idl/thunderbird-%{majversion}/.mkdir.done
 
 %files devel
 %defattr(-,root,root)
@@ -599,7 +598,7 @@ fi
 %{_libdir}/thunderbird-devel-%{majversion}/*
 %dir %{_includedir}/thunderbird-%{version}
 %{_includedir}/thunderbird-%{version}/*
-%{_includedir}/thunderbird-%{version}/.mkdir.done
+#%{_includedir}/thunderbird-%{version}/.mkdir.done
 
 #%package i18n-af
 #Summary:       Afrikaans language support for Thunderbird
@@ -1232,6 +1231,9 @@ fi
 #%{tbdir}/extensions/langpack-zh-TW@thunderbird.mozilla.org/
 
 %changelog
+* Tue Jun 17 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 24.6.0-1mamba
+- update to 24.6.0
+
 * Sat Aug 10 2013 Automatic Build System <autodist@mambasoft.it> 17.0.8-1mamba
 - automatic version update by autodist