Author: glen Date: Fri Nov 3 13:00:19 2006 GMT Module: SPECS Tag: DEVEL ---- Log message: - javaxpcom bcond
---- Files affected: SPECS: mozilla-firefox.spec (1.95.2.42 -> 1.95.2.43) ---- Diffs: ================================================================ Index: SPECS/mozilla-firefox.spec diff -u SPECS/mozilla-firefox.spec:1.95.2.42 SPECS/mozilla-firefox.spec:1.95.2.43 --- SPECS/mozilla-firefox.spec:1.95.2.42 Thu Nov 2 22:31:53 2006 +++ SPECS/mozilla-firefox.spec Fri Nov 3 14:00:13 2006 @@ -17,12 +17,13 @@ # Conditional build: %bcond_with tests # enable tests (whatever they check) %bcond_without gnome # disable all GNOME components (gnomevfs, gnome, gnomeui) +%bcond_without javaxpcom # # Summary: Mozilla Firefox web browser Summary(pl): Mozilla Firefox - przeglądarka WWW Name: mozilla-firefox Version: 2.0 -Release: 0.15 +Release: 0.17 License: MPL/LGPL Group: X11/Applications/Networking Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2 @@ -119,9 +120,7 @@ %prep %setup -qc cd mozilla -#%patch0 -p1 %patch1 -p1 -#%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -140,17 +139,10 @@ cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf -#export LIBIDL_CONFIG="%{_bindir}/libIDL-config-2" - cat << 'EOF' > .mozconfig . $topsrcdir/browser/config/mozconfig -# We're not allowed to do that! -#export BUILD_OFFICIAL=1 -#export MOZILLA_OFFICIAL=1 -#mk_add_options BUILD_OFFICIAL=1 -#mk_add_options MOZILLA_OFFICIAL=1 - +# 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} @@ -229,7 +221,7 @@ ac_add_options --enable-update-channel=default ac_add_options --enable-reorder ac_add_options --enable-libxul -ac_add_options --disable-v1-string-abi +#ac_add_options --disable-v1-string-abi ac_add_options --with-default-mozilla-five-home=%{_firefoxdir} ac_cv_visibility_pragma=no EOF @@ -384,8 +376,11 @@ %{_firefoxdir}/extensions/[EMAIL PROTECTED]/* # javaxpcom +%if %{with javaxpcom} %{_firefoxdir}/javaxpcom-src.jar %{_firefoxdir}/javaxpcom.jar +%{_firefoxdir}/extensions/{cf2812dc-6a7c-4402-b639-4d277dac4c36} +%endif # updater %{_firefoxdir}/updater @@ -396,13 +391,12 @@ # check what these are %{_firefoxdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -%{_firefoxdir}/extensions/{cf2812dc-6a7c-4402-b639-4d277dac4c36} %{_firefoxdir}/LICENSE %{_firefoxdir}/README.txt %{_firefoxdir}/chrome/chromelist.txt -%{_firefoxdir}/chrome/installed-chrome.txt %{_firefoxdir}/dependentlibs.list +#%{_firefoxdir}/chrome/installed-chrome.txt # files created by regxpcom and firefox -register %ghost %{_firefoxdir}/components/compreg.dat @@ -431,6 +425,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.95.2.43 2006/11/03 13:00:13 glen +- javaxpcom bcond + Revision 1.95.2.42 2006/11/02 21:31:53 glen - avoid searching for provides from internal components ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.95.2.42&r2=1.95.2.43&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
