Author: adamg Date: Sat Jan 21 16:04:51 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - fix enigmail (idea borrowed from opensuse) - cleaned up %files - release 0.2
---- Files affected: SPECS: mozilla-thunderbird.spec (1.49 -> 1.50) ---- Diffs: ================================================================ Index: SPECS/mozilla-thunderbird.spec diff -u SPECS/mozilla-thunderbird.spec:1.49 SPECS/mozilla-thunderbird.spec:1.50 --- SPECS/mozilla-thunderbird.spec:1.49 Thu Jan 19 17:33:42 2006 +++ SPECS/mozilla-thunderbird.spec Sat Jan 21 17:04:46 2006 @@ -12,7 +12,7 @@ Summary(pl): Mozilla Thunderbird - klient poczty Name: mozilla-thunderbird Version: 1.5 -Release: 0.1 +Release: 0.2 License: MPL/LGPL Group: Applications/Networking Source0: http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}-source.tar.bz2 @@ -21,6 +21,7 @@ # Source1-md5: d326c302c1d2d68217fffcaa01ca7632 Source2: %{name}.desktop Source3: %{name}.sh +Source4: %{name}-enigmail.manifest Patch0: %{name}-alpha-gcc3.patch Patch1: %{name}-gfx.patch Patch2: %{name}-nss.patch @@ -28,6 +29,7 @@ Patch4: %{name}-blockimage.patch Patch5: %{name}-gcc-bugs.patch Patch6: %{name}-nopangoxft.patch +Patch7: %{name}-enigmail-shared.patch # official patches # certain ui operations cause prolonged hang (cpu at 100%) Patch100: %{name}-bug305970.patch @@ -95,6 +97,7 @@ ##%patch4 -p1 ##%patch5 -p1 %patch6 -p1 +%{?with_enigmail:%patch7 -p1} # official patches %patch100 -p1 @@ -201,6 +204,28 @@ install mail/app/default.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-thunderbird.xpm install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/mozilla-thunderbird.desktop +%if %{with enigmail} +_enig_dir=$RPM_BUILD_ROOT%{_thunderbirddir}/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\} +mkdir -p $_enig_dir/chrome/ +mkdir -p $_enig_dir/components/ +mkdir -p $_enig_dir/defaults/preferences/ +mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail.jar $_enig_dir/chrome/ +mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail-skin-tbird.jar $_enig_dir/chrome/ +mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/components/enig* $_enig_dir/components/ +mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/components/libenigmime.so $_enig_dir/components/ +mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/components/ipc.xpt $_enig_dir/components/ +mv -f $RPM_BUILD_ROOT%{_thunderbirddir}/defaults/preferences/enigmail.js $_enig_dir/defaults/preferences/ +cp -f $RPM_BUILD_DIR/mozilla/mailnews/extensions/enigmail/package/install.rdf $_enig_dir/ +rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/defaults/preferences/ +rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail-en-US.jar +rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmail-skin.jar +rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/chrome/enigmime.jar +rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/components/enig* +rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/components/libenigmime.so +rm -rf $RPM_BUILD_ROOT%{_thunderbirddir}/components/ipc.xpt +cp -f %{SOURCE4} $_enig_dir/chrome.manifest +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -208,8 +233,11 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/mozilla-thunderbird %dir %{_thunderbirddir} -%{_thunderbirddir}/res +%dir %{_thunderbirddir}/chrome %dir %{_thunderbirddir}/components +%dir %{_thunderbirddir}/extensions +%dir %{_thunderbirddir}/init.d +%{_thunderbirddir}/res %attr(755,root,root) %{_thunderbirddir}/components/*.so %{_thunderbirddir}/components/*.js %{_thunderbirddir}/components/*.xpt @@ -219,7 +247,6 @@ %{_thunderbirddir}/defaults %{_thunderbirddir}/greprefs %{_thunderbirddir}/icons -#%{_thunderbirddir}/plugins %attr(755,root,root) %{_thunderbirddir}/*.so %attr(755,root,root) %{_thunderbirddir}/*.sh %attr(755,root,root) %{_thunderbirddir}/*-bin @@ -227,41 +254,26 @@ %attr(755,root,root) %{_thunderbirddir}/reg* %attr(755,root,root) %{_thunderbirddir}/thunderbird %attr(755,root,root) %{_thunderbirddir}/thunderbird-config -#%attr(755,root,root) %{_thunderbirddir}/TestGtkEmbed -#%ifarch %{ix86} -#%attr(755,root,root) %{_thunderbirddir}/elf-dynstr-gc -#%endif %{_thunderbirddir}/*.txt %{_thunderbirddir}/x* -%dir %{_thunderbirddir}/chrome %{_thunderbirddir}/chrome/US.jar %{_thunderbirddir}/chrome/classic.jar %{_thunderbirddir}/chrome/comm.jar %{_thunderbirddir}/chrome/en-US.jar -#%{_thunderbirddir}/chrome/help.jar %{_thunderbirddir}/chrome/icons %{_thunderbirddir}/chrome/messenger.jar -#%{_thunderbirddir}/chrome/modern.jar %{_thunderbirddir}/chrome/newsblog.jar %{_thunderbirddir}/chrome/offline.jar -#%{_thunderbirddir}/chrome/pipnss.jar %{_thunderbirddir}/chrome/pippki.jar %{_thunderbirddir}/chrome/toolkit.jar %{_thunderbirddir}/chrome/*.txt -#%{_thunderbirddir}/chrome/embed-sample.jar -# TODO: check if we really need these %{_thunderbirddir}/chrome/*.manifest -%if %{with enigmail} -%{_thunderbirddir}/chrome/enigmail-en-US.jar -%{_thunderbirddir}/chrome/enigmail-skin-tbird.jar -%{_thunderbirddir}/chrome/enigmail-skin.jar -%{_thunderbirddir}/chrome/enigmail.jar -%{_thunderbirddir}/chrome/enigmime.jar -%endif -%dir %{_thunderbirddir}/init.d %{_thunderbirddir}/init.d/README %{_thunderbirddir}/dependentlibs.list -%{_thunderbirddir}/extensions +%{_thunderbirddir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +%if %{with enigmail} +%{_thunderbirddir}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5} +%endif %{_thunderbirddir}/updater %{_thunderbirddir}/updater.ini %{_pixmapsdir}/* @@ -280,6 +292,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.50 2006/01/21 16:04:46 adamg +- fix enigmail (idea borrowed from opensuse) +- cleaned up %files +- release 0.2 + Revision 1.49 2006/01/19 16:33:42 adamg - globbed archive filename (shouldn't fail on i{3,5}86 now) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla-thunderbird.spec?r1=1.49&r2=1.50&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
