Author: glen Date: Wed Mar 14 09:18:06 2007 GMT Module: SPECS Tag: AC-branch ---- Log message: - HEAD merge
---- Files affected: SPECS: seamonkey.spec (1.32.2.22 -> 1.32.2.23) ---- Diffs: ================================================================ Index: SPECS/seamonkey.spec diff -u SPECS/seamonkey.spec:1.32.2.22 SPECS/seamonkey.spec:1.32.2.23 --- SPECS/seamonkey.spec:1.32.2.22 Fri Mar 9 22:35:53 2007 +++ SPECS/seamonkey.spec Wed Mar 14 10:18:00 2007 @@ -5,7 +5,7 @@ %bcond_with gnomeui # enable GnomeUI %bcond_without svg # disable svg support # -%define _enigmail_ver 0.94.2 +%define _enigmail_ver 0.94.3 Summary: SeaMonkey Community Edition - web browser Summary(es): Navegador de Internet SeaMonkey Community Edition Summary(pl): SeaMonkey Community Edition - przeglądarka WWW @@ -18,7 +18,7 @@ Source0: ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/%{name}-%{version}.source.tar.bz2 # Source0-md5: 4409ad62738d403719a62d00c0276e08 Source1: http://www.mozilla-enigmail.org/downloads/src/enigmail-%{_enigmail_ver}.tar.gz -# Source1-md5: cc1ba2bec7c3a2ac408ef24fbf1884de +# Source1-md5: 08727eea68589eb4c9087ca771229f06 Source2: %{name}.desktop Source3: %{name}-composer.desktop Source4: %{name}-chat.desktop @@ -50,7 +50,6 @@ BuildRequires: zip >= 2.1 BuildRequires: zlib-devel >= 1.2.3 Requires(post,postun): %{name}-libs = %{epoch}:%{version}-%{release} -Requires(post,postun): /sbin/ldconfig Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: browser-plugins >= 2.0 %{?with_svg:Requires: cairo >= 1.0.0} @@ -63,12 +62,17 @@ Obsoletes: seamonkey-calendar BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define specflags -fno-strict-aliasing - %define _seamonkeydir %{_libdir}/%{name} -%define _chromedir %{_libdir}/%{name}/chrome +%define _chromedir %{_libdir}/%{name}/chrome + # seamonkey, mozilla and firefox provide their own versions %define _noautoreqdep libgfxpsshar.so libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libldap50.so libmozjs.so libprldap50.so libssldap50.so libxlibrgb.so libxpcom.so libxpcom_compat.so libxpcom_core.so libxpistub.so +# we don't want these to satisfy xulrunner-devel +%define _noautoprov libmozjs.so libxpcom.so libxul.so +# and as we don't provide them, don't require either +%define _noautoreq libmozjs.so libxpcom.so libxul.so + +%define specflags -fno-strict-aliasing %description SeaMonkey Community Edition is an open-source web browser, designed @@ -110,7 +114,6 @@ Summary(ru): đĎŢÔĎ×ÁŃ ÓÉÓÔĹÍÁ ÎÁ ĎÓÎĎ×Ĺ SeaMonkey Community Edition Group: X11/Applications/Networking Requires(post,postun): %{name} = %{epoch}:%{version}-%{release} -Requires(post,postun): /sbin/ldconfig Requires: %{name} = %{epoch}:%{version}-%{release} Obsoletes: mozilla-mailnews @@ -129,7 +132,6 @@ Summary(pl): Enigmail %{_enigmail_ver} - obsługa PGP/GPG dla SeaMonkey Community Edition Group: X11/Applications/Networking Requires(post,postun): %{name}-mailnews = %{epoch}:%{version}-%{release} -Requires(post,postun): /sbin/ldconfig Requires: %{name}-mailnews = %{epoch}:%{version}-%{release} Requires: gnupg >= 1.4.2.2 @@ -755,6 +757,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.32.2.23 2007/03/14 09:18:00 glen +- HEAD merge + Revision 1.32.2.22 2007/03/09 21:35:53 qboosh - added CVE references to 1.1.1 upgrade changelog ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/seamonkey.spec?r1=1.32.2.22&r2=1.32.2.23&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
