X-Git-Url: http://git.pld-linux.org/?p=packages%2Fthunderbird.git;a=blobdiff_plain;f=icedove.spec;h=cdbe98a7c2e5e1773f0d79c28c664d1fe340e048;hp=40a555e0f43b10502d4209115cee5f94764cbf73;hb=ecf043938b053377784af7c9a86c6175ae7640ce;hpb=2a0600bd3371dd287da62cc4e074767b666f7cad diff --git a/icedove.spec b/icedove.spec index 40a555e..cdbe98a 100644 --- a/icedove.spec +++ b/icedove.spec @@ -1,3 +1,12 @@ +# TODO: +# - separate spec for enigmail +# - fix icedove (building) and installing nss/nspr libs! +# - build with system mozldap +# - about dialog broken: +#XML Parsing Error: undefined entity +#Location: chrome://messenger/content/aboutDialog.xul +#Line Number 27, Column 37: &logoTrademark; +#------------------------------------^ # # Conditional builds %bcond_without enigmail # don't build enigmail - GPG/PGP support @@ -5,78 +14,79 @@ %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 +%bcond_with xulrunner # build with system xulrunner + %if %{without gnome} %undefine with_gnomeui %undefine with_gnomevfs %endif -%define enigmail_ver 0.95.7 + +%define enigmail_ver 1.1.2 + +%if %{without xulrunner} +# The actual sqlite version (see RHBZ#480989): +%define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR) +%endif Summary: Icedove - email client Summary(pl.UTF-8): Icedove - klient poczty Name: icedove -Version: 2.0.0.21 -Release: 2 +Version: 3.1.2 +Release: 0.2 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: 55e24753a7ccf2fbf0272987dd4bb086 +Group: X11/Applications/Networking +Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2 +# Source0-md5: 48e80576a7af70e64d30a5162364525a Source1: http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz -# Source1-md5: bbee59bab58b97e33e85015a5ae5de7b +# Source1-md5: 7d329d5e8afbbb28214ca1995beb09c9 Source2: %{name}-branding.tar.bz2 -# Source2-md5: e775b8cb658de32f30b403bc9b7950bf +# Source2-md5: 2da351522bdd7f4a3bd8aaff4c776976 Source3: %{name}-rm_nonfree.sh Source4: %{name}.desktop Source5: %{name}.sh Source6: %{name}-enigmail.manifest Patch0: %{name}-branding.patch -Patch1: %{name}-lib_path.patch -Patch2: %{name}-enigmail-shared.patch -Patch3: %{name}-gcc.patch -Patch4: %{name}-fonts.patch -Patch5: %{name}-install.patch -Patch6: %{name}-myspell.patch -Patch7: %{name}-regionNames.patch -Patch8: %{name}-prefs.patch +Patch1: %{name}-enigmail-shared.patch +Patch2: %{name}-gcc.patch +Patch3: %{name}-fonts.patch +Patch4: %{name}-install.patch +Patch5: %{name}-hunspell.patch +Patch6: %{name}-prefs.patch +Patch7: system-mozldap.patch +Patch8: %{name}-makefile.patch +Patch9: %{name}-libpng.patch URL: http://www.pld-linux.org/Packages/Icedove -# http://www.mozilla.org/security/announce/2009/mfsa2009-24.html -# http://www.mozilla.org/security/announce/2009/mfsa2009-29.html -# http://www.mozilla.org/security/announce/2009/mfsa2009-32.html -# Solution: update to 2.0.0.22: -BuildRequires: security(CVE-2009-1392) -BuildRequires: security(CVE-2009-1832) -BuildRequires: security(CVE-2009-1833) -BuildRequires: security(CVE-2009-1838) -BuildRequires: security(CVE-2009-1841) -# -# http://www.mozilla.org/security/announce/2009/mfsa2009-27.html -# Solution: update to 2.0.0.22: -BuildRequires: security(CVE-2009-1836) -# %{?with_gnomevfs:BuildRequires: GConf2-devel >= 1.2.1} BuildRequires: automake 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: libgnomeui-devel >= 2.2.0} BuildRequires: libjpeg-devel >= 6b 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: pkgconfig BuildRequires: sed >= 4.0 +BuildRequires: sqlite3-devel >= 3.6.22 +BuildRequires: startup-notification-devel >= 0.8 BuildRequires: xorg-lib-libXext-devel -BuildRequires: xorg-lib-libXft-devel >= 2.1 BuildRequires: xorg-lib-libXinerama-devel -BuildRequires: xorg-lib-libXp-devel BuildRequires: xorg-lib-libXt-devel +BuildRequires: zip +%if %{with xulrunner} +%else Requires: myspell-common Requires: nspr >= 1:4.6.1 Requires: nss >= 1:3.11.3 +Requires: sqlite3 >= %{sqlite_build_version} +%endif Obsoletes: mozilla-thunderbird Obsoletes: mozilla-thunderbird-dictionary-en-US BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -87,9 +97,9 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _noautoreqdep libgfxpsshar.so libgkgfx.so libgtkxtbin.so libjsj.so libxpcom_compat.so libxpcom_core.so libxpistub.so %define _noautoprovfiles %{_libdir}/%{name}/components # we don't want these to satisfy xulrunner-devel -%define _noautoprov libgtkembedmoz.so libldap50.so libmozjs.so libprldap50.so libssldap50.so libxpcom.so libxul.so +%define _noautoprov libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so # and as we don't provide them, don't require either -%define _noautoreq libgtkembedmoz.so libldap50.so libmozjs.so libprldap50.so libssldap50.so libxpcom.so libxul.so +%define _noautoreq libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so %description Icedove is an open-source,fast and portable email client. @@ -97,6 +107,20 @@ Icedove is an open-source,fast and portable email client. %description -l pl.UTF-8 Icedove jest open sourcowym, szybkim i przenośnym klientem poczty. +%package addon-lightning +Summary: An integrated calendar for Icedove +Summary(pl.UTF-8): Zintegrowany kalendarz dla Icedove +License: MPL 1.1 or GPL v2+ or LGPL v2.1+ +Group: Applications/Networking +Requires: %{name} = %{version}-%{release} + +%description addon-lightning +Lightning is an calendar extension to Icedove email client. + +%description addon-lightning -l pl.UTF-8 +Lightning to rozszerzenie do klienta poczty Icedove dodające +funkcjonalność kalendarza. + %package addon-enigmail Summary: Extension for the authentication and encryption features provided by GnuPG Summary(pl.UTF-8): Rozszerzenie do uwierzytelniania i szyfrowania zapewnianego przez GnuPG @@ -104,6 +128,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 @@ -121,8 +146,8 @@ Main Features: %description addon-enigmail -l pl.UTF-8 Enigmail to rozszerzenie klienta pocztowego Icedove pozwalające -użytkownikom na dostęp do uwierzytelniania i szyfrowania -zapewnianego przez GnuPG. +użytkownikom na dostęp do uwierzytelniania i szyfrowania zapewnianego +przez GnuPG. Główne możliwości: - szyfrowanie/podpisywanie poczty przy wysyłaniu, @@ -134,34 +159,39 @@ Główne możliwości: - interfejs do zarządzania kluczami OpenPGP %prep -%setup -q -c -a2 +%setup -qc +mv -f comm-1.9.2 mozilla +%setup -q -T -D -a2 cd mozilla %{?with_enigmail:tar xvfz %{SOURCE1} -C mailnews/extensions} /bin/sh %{SOURCE3} %patch0 -p1 -%patch1 -p1 -%{?with_enigmail:%patch2 -p1} +%{?with_enigmail:%patch1 -p1} +%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 - -:> config/gcc_hidden.h +%patch8 -p0 +%patch9 -p0 %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.* 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 +install -d libxul-sdk +ln -snf %{_libdir}/xulrunner-sdk libxul-sdk/sdk + +cat << EOF > .mozconfig +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu} +# Options for 'configure' (same as command-line options). ac_add_options --prefix=%{_prefix} ac_add_options --exec-prefix=%{_exec_prefix} ac_add_options --bindir=%{_bindir} @@ -176,12 +206,19 @@ ac_add_options --sharedstatedir=%{_sharedstatedir} ac_add_options --mandir=%{_mandir} ac_add_options --infodir=%{_infodir} %if %{?debug:1}0 +ac_add_options --disable-optimize ac_add_options --enable-debug ac_add_options --enable-debug-modules +ac_add_options --enable-debugger-info-modules +ac_add_options --enable-crash-on-assert %else ac_add_options --disable-debug ac_add_options --disable-debug-modules +ac_add_options --disable-logging +ac_add_options --enable-optimize="%{rpmcflags} -Os" %endif +ac_add_options --disable-strip +ac_add_options --disable-strip-libs %if %{with tests} ac_add_options --enable-tests %else @@ -199,74 +236,102 @@ ac_add_options --disable-gnomevfs %endif %if %{with ldap} ac_add_options --enable-ldap +ac_add_options --with-system-ldap %else ac_add_options --disable-ldap %endif +ac_add_options --disable-crashreporter +ac_add_options --disable-xterm-updates +ac_add_options --enable-postscript +%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-updater 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 ac_add_options --enable-reorder -ac_add_options --disable-strip -ac_add_options --disable-strip-libs -ac_add_options --enable-system-cairo -ac_add_options --enable-system-myspell +ac_add_options --enable-startup-notification ac_add_options --enable-svg +ac_add_options --enable-system-cairo +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite 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-distribution-id=org.pld-linux +ac_add_options --with-branding=icedove/branding +%if %{with xulrunner} +ac_add_options --with-libxul-sdk=$(pwd)/libxul-sdk +ac_add_options --enable-shared +%else +ac_add_options --enable-static +%endif +ac_add_options --with-pthreads +ac_add_options --with-system-bz2 ac_add_options --with-system-jpeg ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-png ac_add_options --with-system-zlib -ac_add_options --with-pthreads ac_add_options --enable-single-profile ac_add_options --disable-profilesharing -ac_add_options --with-branding=icedove/branding ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name} EOF -%{__make} -j1 -f client.mk build_all \ +%{__make} -j1 -f client.mk build \ + STRIP="/bin/true" \ CC="%{__cc}" \ CXX="%{__cxx}" %if %{with enigmail} - cd mailnews/extensions/enigmail - ./makemake -r - %{__make} +top=$(pwd) +cd mailnews/extensions/enigmail +./makemake -r -o $top/obj-%{_target_cpu} +%{__make} -C $top/obj-%{_target_cpu}/mailnews/extensions/enigmail \ + STRIP="/bin/true" \ + CC="%{__cc}" \ + CXX="%{__cxx}" %endif %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}} \ - $RPM_BUILD_ROOT%{_datadir}/%{name} + $RPM_BUILD_ROOT%{_datadir}/%{name} +install -d $RPM_BUILD_ROOT%{_libdir}/%{name} -cd mozilla -%{__make} -C xpinstall/packager stage-package \ +cd mozilla/obj-%{_target_cpu} +%{__make} -C mail/installer stage-package \ DESTDIR=$RPM_BUILD_ROOT \ MOZ_PKG_APPDIR=%{_libdir}/%{name} \ PKG_SKIP_STRIP=1 +# 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}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons -mv $RPM_BUILD_ROOT%{_libdir}/%{name}/init.d $RPM_BUILD_ROOT%{_datadir}/%{name}/init.d 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}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons -ln -s ../../share/%{name}/init.d $RPM_BUILD_ROOT%{_libdir}/%{name}/init.d 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 @@ -276,20 +341,18 @@ ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries 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 ../icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/icedove.png %if %{with enigmail} -_enig_dir=$RPM_BUILD_ROOT%{_libdir}/%{name}/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\} -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-tbird.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/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 +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 @@ -297,12 +360,20 @@ 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} $_enig_dir/chrome.manifest -cp -f icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/icedove.png +cp -f %{SOURCE6} $ext_dir/chrome.manifest %endif -# win32 stuff -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/dirver +# remove unecessary stuff +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/components/components.list + +# never package these +# nss +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 +# mozldap +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so %clean rm -rf $RPM_BUILD_ROOT @@ -311,7 +382,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 init.d 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 @@ -325,32 +396,28 @@ exit 0 %attr(755,root,root) %{_bindir}/mozilla-thunderbird %attr(755,root,root) %{_bindir}/thunderbird %dir %{_libdir}/%{name} +%{_libdir}/%{name}/*.ini %dir %{_libdir}/%{name}/components %attr(755,root,root) %{_libdir}/%{name}/components/*.so %{_libdir}/%{name}/components/*.js %{_libdir}/%{name}/components/*.xpt -%attr(755,root,root) %{_libdir}/%{name}/*.so +%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so +%attr(755,root,root) %{_libdir}/%{name}/libxpcom.so +%attr(755,root,root) %{_libdir}/%{name}/libxpcom_core.so %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}/init.d %{_libdir}/%{name}/isp +%{_libdir}/%{name}/modules %{_libdir}/%{name}/res -%{_libdir}/%{name}/dependentlibs.list -%{_libdir}/%{name}/updater -%{_libdir}/%{name}/updater.ini %{_pixmapsdir}/*.png %{_desktopdir}/*.desktop @@ -358,14 +425,20 @@ exit 0 %{_datadir}/%{name}/chrome %{_datadir}/%{name}/defaults %{_datadir}/%{name}/greprefs -%{_datadir}/%{name}/icons -%{_datadir}/%{name}/init.d %{_datadir}/%{name}/isp +%{_datadir}/%{name}/modules %{_datadir}/%{name}/res %dir %{_libdir}/%{name}/extensions %{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +%if %{with lightning} +%files addon-lightning +%defattr(644,root,root,755) +%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} +%{_libdir}/%{name}/extensions/calendar-timezones@mozilla.org +%endif + %if %{with enigmail} %files addon-enigmail %defattr(644,root,root,755)