X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=icedove.spec;h=ef1b3a15052983c701f864717f4303cd104ef890;hb=d478bac589113a505c9e138b7808ae90f426f2c0;hp=8f5e4aa6a38c7a22687ccdfe4669598d2424ed45;hpb=f4aadbdb2a0e312e3d2b2298ac51d021bc48932d;p=packages%2Ficedove.git diff --git a/icedove.spec b/icedove.spec index 8f5e4aa..ef1b3a1 100644 --- a/icedove.spec +++ b/icedove.spec @@ -10,13 +10,18 @@ %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 -%bcond_with xulrunner # build with system xulrunner +%bcond_with xulrunner # build with xulrunner +%bcond_with crashreporter # report crashes to crash-stats.mozilla.com %if %{without gnome} %undefine with_gnomeui %undefine with_gnomevfs %endif +%if %{?_enable_debug_packages} != 1 +%undefine crashreporter +%endif + %define enigmail_ver 1.1.2 %if %{without xulrunner} @@ -27,12 +32,12 @@ Summary: Icedove - email client Summary(pl.UTF-8): Icedove - klient poczty Name: icedove -Version: 3.0.5 -Release: 2 +Version: 3.1.9 +Release: 1 License: MPL 1.1 or GPL v2+ or LGPL v2.1+ -Group: Applications/Networking +Group: X11/Applications/Networking Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2 -# Source0-md5: 564911289b5d895ba5eaf4b3fbed51e8 +# Source0-md5: e6917c419d3aaa8083a1d4b53fb80d8c Source1: http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz # Source1-md5: 7d329d5e8afbbb28214ca1995beb09c9 Source2: %{name}-branding.tar.bz2 @@ -40,7 +45,6 @@ Source2: %{name}-branding.tar.bz2 Source3: %{name}-rm_nonfree.sh Source4: %{name}.desktop Source5: %{name}.sh -Source6: %{name}-enigmail.manifest Patch0: %{name}-branding.patch Patch1: %{name}-enigmail-shared.patch Patch2: %{name}-gcc.patch @@ -49,17 +53,27 @@ Patch4: %{name}-install.patch Patch5: %{name}-hunspell.patch Patch6: %{name}-prefs.patch Patch7: system-mozldap.patch +Patch8: %{name}-makefile.patch +Patch9: %{name}-libpng.patch +Patch10: %{name}-extensiondir.patch +Patch11: crashreporter.patch +Patch12: no-subshell.patch URL: http://www.pld-linux.org/Packages/Icedove %{?with_gnomevfs:BuildRequires: GConf2-devel >= 1.2.1} +BuildRequires: alsa-lib-devel BuildRequires: automake +BuildRequires: bzip2-devel 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: libIDL-devel >= 0.8.0 %{?with_gnomevfs:BuildRequires: libgnome-devel >= 2.0} +%{?with_gnomeui:BuildRequires: libgnome-keyring-devel} %{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0} +BuildRequires: libiw-devel BuildRequires: libjpeg-devel >= 6b +BuildRequires: libnotify-devel >= 0.4 BuildRequires: libpng-devel >= 1.2.0 BuildRequires: libstdc++-devel BuildRequires: nspr-devel >= 1:4.8 @@ -67,12 +81,13 @@ BuildRequires: nss-devel >= 1:3.12.0 BuildRequires: pango-devel >= 1:1.1.0 BuildRequires: pkgconfig BuildRequires: sed >= 4.0 -BuildRequires: sqlite3-devel >= 3.6.22 +BuildRequires: sqlite3-devel >= 3.7.2-2 BuildRequires: startup-notification-devel >= 0.8 BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-libXinerama-devel BuildRequires: xorg-lib-libXt-devel BuildRequires: zip +Requires(post): mktemp >= 1.5-18 %if %{with xulrunner} %else Requires: myspell-common @@ -87,12 +102,15 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define filterout_cpp -D_FORTIFY_SOURCE=[0-9]+ # iceweasel/icedove/iceape provide their own versions -%define _noautoreqdep libgfxpsshar.so libgkgfx.so libgtkxtbin.so libjsj.so libxpcom_compat.so libxpcom_core.so libxpistub.so +%define _noautoreqdep libgfxpsshar.so libgkgfx.so libgtkxtbin.so libjsj.so libxpcom_compat.so libxpistub.so %define _noautoprovfiles %{_libdir}/%{name}/components # we don't want these to satisfy xulrunner-devel -%define _noautoprov libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so +%define _noautoprov libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so libxpcom_core.so # and as we don't provide them, don't require either -%define _noautoreq libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so +%define _noautoreq libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so libxpcom_core.so + +%define topdir %{_builddir}/%{name}-%{version} +%define objdir %{topdir}/obj-%{_target_cpu} %description Icedove is an open-source,fast and portable email client. @@ -153,10 +171,10 @@ Główne możliwości: %prep %setup -qc -mv -f comm-1.9.1 mozilla +mv -f comm-1.9.2 mozilla %setup -q -T -D -a2 cd mozilla -%{?with_enigmail:tar xvfz %{SOURCE1} -C mailnews/extensions} +%{?with_enigmail:%{__gzip} -dc %{SOURCE1} | %{__tar} -xf - -C mailnews/extensions} /bin/sh %{SOURCE3} %patch0 -p1 %{?with_enigmail:%patch1 -p1} @@ -166,21 +184,30 @@ cd mozilla %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p0 +%patch9 -p0 +%patch10 -p2 +%patch11 -p2 +%patch12 -p1 %build cd mozilla -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.* mozilla/build/autoconf cp -f %{_datadir}/automake/config.* mozilla/nsprpub/build/autoconf -cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf +cp -f %{_datadir}/automake/config.* directory/sdks/c-sdk/config/autoconf install -d libxul-sdk ln -snf %{_libdir}/xulrunner-sdk libxul-sdk/sdk cat << EOF > .mozconfig -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu} +mk_add_options MOZ_OBJDIR=%{objdir} + +export CFLAGS="%{rpmcflags}" +export CXXFLAGS="%{rpmcflags}" + +%if %{with crashreporter} +export MOZ_DEBUG_SYMBOLS=1 +%endif # Options for 'configure' (same as command-line options). ac_add_options --prefix=%{_prefix} @@ -231,7 +258,11 @@ ac_add_options --with-system-ldap %else ac_add_options --disable-ldap %endif +%if %{with crashreporter} +ac_add_options --enable-crashreporter +%else ac_add_options --disable-crashreporter +%endif ac_add_options --disable-xterm-updates ac_add_options --enable-postscript %if %{with lightning} @@ -281,13 +312,19 @@ EOF %{__make} -j1 -f client.mk build \ STRIP="/bin/true" \ + MOZ_MAKE_FLAGS="%{?_smp_mflags}" \ CC="%{__cc}" \ CXX="%{__cxx}" +%if %{with crashreporter} +# create debuginfo for crash-stats.mozilla.com +%{__make} -j1 -C obj-%{_target_cpu} buildsymbols +%endif + %if %{with enigmail} cd mailnews/extensions/enigmail -./makemake -r -%{__make} -C ../../../obj-%{_target_cpu}/mailnews/extensions/enigmail \ +./makemake -r -o %{objdir} +%{__make} -C %{objdir}/mailnews/extensions/enigmail \ STRIP="/bin/true" \ CC="%{__cc}" \ CXX="%{__cxx}" @@ -295,67 +332,96 @@ cd mailnews/extensions/enigmail %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}} \ - $RPM_BUILD_ROOT%{_datadir}/%{name} -install -d $RPM_BUILD_ROOT%{_libdir}/%{name} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name},%{_datadir}/%{name},%{_pixmapsdir},%{_desktopdir}} -cd mozilla -%{__make} -C obj-%{_target_cpu}/mail/installer stage-package \ +cd %{objdir} +%{__make} -C mail/installer stage-package \ DESTDIR=$RPM_BUILD_ROOT \ MOZ_PKG_APPDIR=%{_libdir}/%{name} \ PKG_SKIP_STRIP=1 +# Enable crash reporter for Firefox application +%if %{with crashreporter} +%{__sed} -i -e 's/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/' $RPM_BUILD_ROOT%{_libdir}/%{name}/application.ini + +# Add debuginfo for crash-stats.mozilla.com +install -d $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{_libdir}/%{name} +cp -a mozilla/dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir}/%{name} +%endif + +# copy manually lightning files, somewhy they are not installed by make +cp -a mozilla/dist/bin/extensions/calendar-timezones@mozilla.org \ + mozilla/dist/bin/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} \ + $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions + # 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}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs mv $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/modules $RPM_BUILD_ROOT%{_datadir}/%{name}/modules 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}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp +ln -s ../../share/%{name}/modules $RPM_BUILD_ROOT%{_libdir}/%{name}/modules ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries +%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries %{__sed} -e 's,@LIBDIR@,%{_libdir},' %{SOURCE5} > $RPM_BUILD_ROOT%{_bindir}/icedove ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/thunderbird ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird -install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop +cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop +cp -a %{topdir}/mozilla/icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png + +# files created by regxpcom -register in post +touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat +touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat +cat << 'EOF' > $RPM_BUILD_ROOT%{_libdir}/%{name}/register +#!/bin/sh +umask 022 +# make temporary HOME, as it attempts to touch files in $HOME/.mozilla +# dangerous if you run this with sudo with keep_env += HOME +# also TMPDIR could be pointing to sudo user's homedir so we reset that too. +t=$(mktemp -d) +%{__rm} %{_libdir}/%{name}/components/{compreg,xpti}.dat +TMPDIR= TMP= HOME=$t %{_libdir}/%{name}/icedove -register +rm -rf $t +EOF +chmod a+rx $RPM_BUILD_ROOT%{_libdir}/%{name}/register %if %{with enigmail} ext_dir=$RPM_BUILD_ROOT%{_libdir}/%{name}/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\} install -d $ext_dir/{chrome,components,defaults/preferences} -mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmail.jar $ext_dir/chrome -mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/enig* $ext_dir/components -mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/libenigmime.so $ext_dir/components -mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/ipc.xpt $ext_dir/components -mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults/preferences/enigmail.js $ext_dir/defaults/preferences -cp -f mailnews/extensions/enigmail/package/install.rdf $ext_dir -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults/preferences -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmail-en-US.jar -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmail-skin.jar -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmime.jar -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/components/enig* -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/libenigmime.so -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/ipc.xpt -cp -f %{SOURCE6} $ext_dir/chrome.manifest -cp -f icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/icedove.png +cd mozilla/dist/bin +cp -rfLp chrome/enigmail.jar $ext_dir/chrome +cp -rfLp chrome/enigmime.jar $ext_dir/chrome +cp -rfLp components/enig* $ext_dir/components +cp -rfLp components/libenigmime.so $ext_dir/components +cp -rfLp components/libipc.so $ext_dir/components +cp -rfLp components/ipc.xpt $ext_dir/components +cp -rfLp defaults/preferences/enigmail.js $ext_dir/defaults/preferences +cd - +cp -a %{topdir}/mozilla/mailnews/extensions/enigmail/package/install.rdf $ext_dir +cp -a %{topdir}/mozilla/mailnews/extensions/enigmail/package/chrome.manifest $ext_dir/chrome.manifest %endif # remove unecessary stuff -rm $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/components/components.list +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/components.list -# never package these +# never package these. always remove # nss -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.* +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.* # nspr -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so # mozldap -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so %clean rm -rf $RPM_BUILD_ROOT @@ -364,7 +430,7 @@ rm -rf $RPM_BUILD_ROOT if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave} fi -for d in chrome defaults greprefs icons isp res; do +for d in chrome defaults greprefs icons isp modules res; do if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then install -d %{_datadir}/%{name} mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d @@ -372,13 +438,17 @@ for d in chrome defaults greprefs icons isp res; do done exit 0 +%post +%{_libdir}/%{name}/register || : + %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/icedove %attr(755,root,root) %{_bindir}/mozilla-thunderbird %attr(755,root,root) %{_bindir}/thunderbird %dir %{_libdir}/%{name} -%{_libdir}/%{name}/*.ini +%{_libdir}/%{name}/application.ini +%{_libdir}/%{name}/platform.ini %dir %{_libdir}/%{name}/components %attr(755,root,root) %{_libdir}/%{name}/components/*.so %{_libdir}/%{name}/components/*.js @@ -390,6 +460,7 @@ exit 0 %attr(755,root,root) %{_libdir}/%{name}/*-bin %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client %attr(755,root,root) %{_libdir}/%{name}/icedove +%attr(755,root,root) %{_libdir}/%{name}/register # symlinks %{_libdir}/%{name}/chrome @@ -397,9 +468,9 @@ exit 0 %{_libdir}/%{name}/dictionaries %{_libdir}/%{name}/greprefs %{_libdir}/%{name}/isp +%{_libdir}/%{name}/modules %{_libdir}/%{name}/res -%{_libdir}/%{name}/dependentlibs.list %{_pixmapsdir}/*.png %{_desktopdir}/*.desktop @@ -408,27 +479,51 @@ exit 0 %{_datadir}/%{name}/defaults %{_datadir}/%{name}/greprefs %{_datadir}/%{name}/isp +%{_datadir}/%{name}/modules %{_datadir}/%{name}/res -%dir %{_libdir}/%{name}/modules -%{_libdir}/%{name}/modules/*.js* -%dir %{_libdir}/%{name}/modules/activity -%{_libdir}/%{name}/modules/activity/*.js -%dir %{_libdir}/%{name}/modules/gloda -%{_libdir}/%{name}/modules/gloda/*.js +%if %{with crashreporter} +%attr(755,root,root) %{_libdir}/%{name}/crashreporter +%{_libdir}/%{name}/crashreporter.ini +%{_libdir}/%{name}/Throbber-small.gif +%endif %dir %{_libdir}/%{name}/extensions %{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +# files created by regxpcom -register +%ghost %{_libdir}/%{name}/components/compreg.dat +%ghost %{_libdir}/%{name}/components/xpti.dat + %if %{with lightning} %files addon-lightning %defattr(644,root,root,755) -%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} +%dir %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} +%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults +%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome +%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest +%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf +%dir %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components +%attr(755,root,root) %{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.so +%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.xpt +%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/*.js +%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules +%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js +%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones.sqlite + %{_libdir}/%{name}/extensions/calendar-timezones@mozilla.org %endif %if %{with enigmail} %files addon-enigmail %defattr(644,root,root,755) -%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5} +%dir %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5} +%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults +%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome +%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome.manifest +%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf +%dir %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components +%attr(755,root,root) %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.so +%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.xpt +%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.js %endif