Author: glen Date: Wed Nov 1 09:18:24 2006 GMT Module: SPECS Tag: DEVEL ---- Log message: - seems javaxpcom needs jsd - try dropping probably obsolete hacks
---- Files affected: SPECS: mozilla-firefox.spec (1.95.2.33 -> 1.95.2.34) ---- Diffs: ================================================================ Index: SPECS/mozilla-firefox.spec diff -u SPECS/mozilla-firefox.spec:1.95.2.33 SPECS/mozilla-firefox.spec:1.95.2.34 --- SPECS/mozilla-firefox.spec:1.95.2.33 Wed Nov 1 01:48:20 2006 +++ SPECS/mozilla-firefox.spec Wed Nov 1 10:18:18 2006 @@ -19,6 +19,7 @@ # /usr/lib/mozilla-firefox/libfreebl3.chk # /usr/lib/mozilla-firefox/libsoftokn3.chk # - previous postun cleanup should be handled by ghost files +# - stop providing mozdir/components/*.so # # Conditional build: %bcond_with tests # enable tests (whatever they check) @@ -28,7 +29,7 @@ Summary(pl): Mozilla Firefox - przeglądarka WWW Name: mozilla-firefox Version: 2.0 -Release: 0.5 +Release: 0.7 License: MPL/LGPL Group: X11/Applications/Networking Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2 @@ -133,19 +134,18 @@ sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure # use system -rm -rf mozilla/nsprpub mozilla/security/nss +#rm -rf mozilla/nsprpub mozilla/security/nss %build cd mozilla -rm -f .mozconfig -export CFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`" -export CXXFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`" +export CFLAGS="%{rpmcflags} $(%{_bindir}/pkg-config mozilla-nspr --cflags-only-I)" +export CXXFLAGS="%{rpmcflags} $(%{_bindir}/pkg-config mozilla-nspr --cflags-only-I)" cp -f %{_datadir}/automake/config.* build/autoconf cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf -LIBIDL_CONFIG="%{_bindir}/libIDL-config-2"; export LIBIDL_CONFIG +#export LIBIDL_CONFIG="%{_bindir}/libIDL-config-2" cat << 'EOF' > .mozconfig . $topsrcdir/browser/config/mozconfig @@ -198,7 +198,6 @@ ac_add_options --disable-dtd-debug ac_add_options --disable-freetype2 ac_add_options --disable-installer -ac_add_options --disable-jsd ac_add_options --disable-ldap ac_add_options --disable-mailnews ac_add_options --disable-profilesharing @@ -232,7 +231,7 @@ ac_add_options --with-system-jpeg ac_add_options --with-system-png ac_add_options --enable-native-uconv -ac_add_options --enable-javaxpcom +ac_add_options --enable-jsd --enable-javaxpcom --with-java-include-path=/usr/lib/jvm/java/include ac_add_options --enable-update-channel=default ac_add_options --enable-reorder ac_add_options --enable-libxul @@ -241,6 +240,31 @@ ac_cv_visibility_pragma=no EOF +%if 0 +# sanity checks +# TODO: should hook somewhere between configure and real make +if [ $(grep -c "MOZ_NATIVE_NSPR = 1" config/autoconf.mk) != 1 ]; then + : internal nspr used! + exit 1 +fi +if [ $(grep -c "MOZ_NATIVE_NSS = 1" config/autoconf.mk) != 1 ]; then + : internal nss used! + exit 1 +fi +if [ $(grep -c "MOZ_NATIVE_ZLIB = 1" config/autoconf.mk) != 1 ]; then + : internal zlib used! + exit 1 +fi +if [ $(grep -c "MOZ_NATIVE_JPEG = 1" config/autoconf.mk) != 1 ]; then + : internal libjpeg used! + exit 1 +fi +if [ $(grep -c "MOZ_NATIVE_PNG = 1" config/autoconf.mk) != 1 ]; then + : internal libpng used! + exit 1 +fi +%endif + %{__make} -j1 -f client.mk build \ CC="%{__cc}" \ CXX="%{__cxx}" @@ -394,6 +418,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.95.2.34 2006/11/01 09:18:18 glen +- seems javaxpcom needs jsd +- try dropping probably obsolete hacks + Revision 1.95.2.33 2006/11/01 00:48:20 glen - added more configure options, reviewed them - install section cleanup and skip tgz step ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.95.2.33&r2=1.95.2.34&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
