Author: blekot Date: Sun Jan 15 15:07:40 2006 GMT Module: SPECS Tag: DEVEL ---- Log message: - proper way of linking libraries (mozilla suite and firefox works together)
---- Files affected: SPECS: mozilla-firefox.spec (1.95.2.19 -> 1.95.2.20) ---- Diffs: ================================================================ Index: SPECS/mozilla-firefox.spec diff -u SPECS/mozilla-firefox.spec:1.95.2.19 SPECS/mozilla-firefox.spec:1.95.2.20 --- SPECS/mozilla-firefox.spec:1.95.2.19 Sun Jan 15 13:48:15 2006 +++ SPECS/mozilla-firefox.spec Sun Jan 15 16:07:34 2006 @@ -13,7 +13,7 @@ Summary(pl): Mozilla Firefox - przeglądarka WWW Name: mozilla-firefox Version: 1.5 -Release: 2.2 +Release: 2.3 License: MPL/LGPL Group: X11/Applications/Networking Source0: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2 @@ -215,10 +215,6 @@ install dist/bin/xpt_dump $RPM_BUILD_ROOT%{_bindir} install dist/bin/xpt_link $RPM_BUILD_ROOT%{_bindir} -# dirty hack agains finding libraries -install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d -echo '%{_libdir}/%{name}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_lib}.conf - ln -sf %{_includedir}/mozilla-firefox/necko/nsIURI.h \ $RPM_BUILD_ROOT%{_includedir}/mozilla-firefox/nsIURI.h @@ -260,8 +256,8 @@ export LD_LIBRARY_PATH unset TMPDIR TMP || : -%{_firefoxdir}/regxpcom -%{_firefoxdir}/firefox -register +MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/regxpcom +MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/firefox -register EOF %clean @@ -306,8 +302,6 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/mozilla* %attr(755,root,root) %{_sbindir}/* -# dirty hack agains libraries -/etc/ld.so.conf.d/*.conf %dir %{_firefoxdir} %{_firefoxdir}/res %dir %{_firefoxdir}/components @@ -363,6 +357,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.95.2.20 2006/01/15 15:07:34 blekot +- proper way of linking libraries (mozilla suite and firefox works together) + Revision 1.95.2.19 2006/01/15 12:48:15 blekot - rel 2.2 (ready for testing) - cosmetics, shorten log, cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.95.2.19&r2=1.95.2.20&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
