Author: havner Date: Wed Jul 26 09:01:02 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - HEAD merge, gcc, fonts patches
---- Files affected: SPECS: mozilla-thunderbird.spec (1.61.2.1 -> 1.61.2.2) ---- Diffs: ================================================================ Index: SPECS/mozilla-thunderbird.spec diff -u SPECS/mozilla-thunderbird.spec:1.61.2.1 SPECS/mozilla-thunderbird.spec:1.61.2.2 --- SPECS/mozilla-thunderbird.spec:1.61.2.1 Wed Jul 26 10:22:16 2006 +++ SPECS/mozilla-thunderbird.spec Wed Jul 26 11:00:57 2006 @@ -11,7 +11,7 @@ Summary(pl): Mozilla Thunderbird - klient poczty Name: mozilla-thunderbird Version: 1.5.0.4 -Release: 1 +Release: 3 License: MPL/LGPL Group: Applications/Networking Source0: http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}-source.tar.bz2 @@ -21,10 +21,13 @@ Source2: %{name}.desktop Source3: %{name}.sh Source4: %{name}-enigmail.manifest +Source5: %{name}.png Patch0: %{name}-nss.patch Patch1: %{name}-lib_path.patch Patch3: %{name}-nopangoxft.patch Patch4: %{name}-enigmail-shared.patch +Patch5: %{name}-gcc.patch +Patch6: %{name}-fonts.patch URL: http://www.mozilla.org/projects/thunderbird/ BuildRequires: automake BuildRequires: freetype-devel >= 1:2.1.8 @@ -51,7 +54,6 @@ %define _thunderbirddir %{_libdir}/%{name} # mozilla and thunderbird provide their own versions %define _noautoreqdep libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so -%define _noautoprovfiles libplc4.so libplds4.so %description Mozilla Thunderbird is an open-source,fast and portable email client. @@ -84,6 +86,8 @@ %patch1 -p1 %patch3 -p1 %{?with_enigmail:%patch4 -p1} +%patch5 -p1 +%patch6 -p1 :> config/gcc_hidden.h @@ -165,7 +169,7 @@ EOF -%{__make} -f client.mk build_all \ +%{__make} -j1 -f client.mk build_all \ CC="%{__cc}" \ CXX="%{__cxx}" @@ -188,7 +192,6 @@ tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-thunderbird-*.tar.gz -install mail/app/default.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-thunderbird.xpm install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/mozilla-thunderbird.desktop %if %{with enigmail} @@ -211,6 +214,7 @@ 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 +cp -f %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-thunderbird.png %endif %clean @@ -278,8 +282,25 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.61.2.1 2006/07/26 08:22:16 havner +Revision 1.61.2.2 2006/07/26 09:00:57 havner +- HEAD merge, gcc, fonts patches + +Revision 1.67 2006/07/26 08:54:14 havner +- fonts patch, rel ++ + +Revision 1.66 2006/07/26 08:21:21 havner - epoch in nss + +Revision 1.65 2006/07/11 12:38:42 jareq +- replace xpm icon by png in desktop file (icons are different) +- rel 2 + +Revision 1.64 2006/07/08 16:59:57 aflinta + - added gcc patch + - disabled smp build (otherwise it will fail) + +Revision 1.62 2006/06/03 15:59:49 qboosh +- removed obsolete noautoprovfiles for nspr Revision 1.61 2006/06/02 21:28:52 adamg - updated to 1.5.0.4 (several security fixes) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla-thunderbird.spec?r1=1.61.2.1&r2=1.61.2.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
