Author: cieciwa Date: Thu Oct 26 10:52:58 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - back to mozilla-firefox 1.5.0.7 - Firefox 2.0 is in branch DEVEL
---- Files affected: SPECS: mozilla-firefox.spec (1.156 -> 1.157) ---- Diffs: ================================================================ Index: SPECS/mozilla-firefox.spec diff -u SPECS/mozilla-firefox.spec:1.156 SPECS/mozilla-firefox.spec:1.157 --- SPECS/mozilla-firefox.spec:1.156 Wed Oct 25 13:33:20 2006 +++ SPECS/mozilla-firefox.spec Thu Oct 26 12:52:53 2006 @@ -18,20 +18,20 @@ Summary: Mozilla Firefox web browser Summary(pl): Mozilla Firefox - przeglądarka WWW Name: mozilla-firefox -Version: 2.0 -Release: 0.1 +Version: 1.5.0.7 +Release: 1 License: MPL/LGPL Group: X11/Applications/Networking Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2 -# Source0-md5: 03709c15cba0e0375ff5336d538f77e7 +# Source0-md5: 518cbd99a3fe663237070013e5cdb1a4 Source1: %{name}.desktop Source2: %{name}.sh -#Patch0: %{name}-nss.patch -#Patch1: %{name}-lib_path.patch -#Patch2: %{name}-nss-system-nspr.patch -#Patch3: %{name}-nopangoxft.patch -#Patch4: %{name}-name.patch -#Patch5: %{name}-fonts.patch +Patch0: %{name}-nss.patch +Patch1: %{name}-lib_path.patch +Patch2: %{name}-nss-system-nspr.patch +Patch3: %{name}-nopangoxft.patch +Patch4: %{name}-name.patch +Patch5: %{name}-fonts.patch # UPDATE or DROP? #PatchX: %{name}-searchplugins.patch URL: http://www.mozilla.org/projects/firefox/ @@ -113,117 +113,91 @@ %prep %setup -qc cd mozilla -#patch0 -p1 -#patch1 -p1 -#patch2 -p1 -#patch3 -p1 -#patch4 -p1 -#patch5 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 -#sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure +sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure %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`" - -#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 - -#cat << 'EOF' > .mozconfig -#. $topsrcdir/browser/config/mozconfig - -#export BUILD_OFFICIAL=1 -#export MOZILLA_OFFICIAL=1 -#mk_add_options BUILD_OFFICIAL=1 -#mk_add_options MOZILLA_OFFICIAL=1 - -#ac_add_options --prefix=%{_prefix} -#ac_add_options --exec-prefix=%{_exec_prefix} -#ac_add_options --bindir=%{_bindir} -#ac_add_options --sbindir=%{_sbindir} -#ac_add_options --sysconfdir=%{_sysconfdir} -#ac_add_options --datadir=%{_datadir} -#ac_add_options --includedir=%{_includedir} -#ac_add_options --libdir=%{_libdir} -#ac_add_options --libexecdir=%{_libexecdir} -#ac_add_options --localstatedir=%{_localstatedir} -#ac_add_options --sharedstatedir=%{_sharedstatedir} -#ac_add_options --mandir=%{_mandir} -#ac_add_options --infodir=%{_infodir} -#ac_add_options --enable-optimize="%{rpmcflags}" -#%if %{?debug:1}0 -#ac_add_options --enable-debug -#ac_add_options --enable-debug-modules -#%else -#ac_add_options --disable-debug -#ac_add_options --disable-debug-modules -#%endif -#%if %{with tests} -#ac_add_options --enable-tests -#%else -#ac_add_options --disable-tests -#%endif -#ac_add_options --disable-composer -#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 -#ac_add_options --disable-xprint -#ac_add_options --enable-canvas -#ac_add_options --enable-crypto -#ac_add_options --enable-default-toolkit=gtk2 -#ac_add_options --enable-mathml -#ac_add_options --enable-pango -#ac_add_options --enable-reorder -#ac_add_options --enable-single-profile -#ac_add_options --enable-strip -#ac_add_options --enable-strip-libs -#ac_add_options --enable-svg -#ac_add_options --enable-system-cairo -#ac_add_options --enable-xft -#ac_add_options --enable-xinerama -#ac_add_options --enable-xpctools -#ac_add_options --with-pthreads -#ac_add_options --with-system-jpeg -#ac_add_options --with-system-nspr -#ac_add_options --with-system-png -#ac_add_options --with-system-zlib -#ac_cv_visibility_pragma=no -#EOF -# -%configure2_13 \ +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`" + +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 + +cat << 'EOF' > .mozconfig +. $topsrcdir/browser/config/mozconfig + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 + +ac_add_options --prefix=%{_prefix} +ac_add_options --exec-prefix=%{_exec_prefix} +ac_add_options --bindir=%{_bindir} +ac_add_options --sbindir=%{_sbindir} +ac_add_options --sysconfdir=%{_sysconfdir} +ac_add_options --datadir=%{_datadir} +ac_add_options --includedir=%{_includedir} +ac_add_options --libdir=%{_libdir} +ac_add_options --libexecdir=%{_libexecdir} +ac_add_options --localstatedir=%{_localstatedir} +ac_add_options --sharedstatedir=%{_sharedstatedir} +ac_add_options --mandir=%{_mandir} +ac_add_options --infodir=%{_infodir} +ac_add_options --enable-optimize="%{rpmcflags}" %if %{?debug:1}0 - --enable-debug \ - --enable-debug-modules \ +ac_add_options --enable-debug +ac_add_options --enable-debug-modules %else - --disable-debug \ - --disable-debug-modules \ +ac_add_options --disable-debug +ac_add_options --disable-debug-modules %endif - --with-system-nspr \ - --with-system-nss \ - --with-system-jpeg \ - --with-system-zlib \ - --with-system-png \ - --enable-canvas \ - --enable-freetype2 \ - --disable-xft \ - --enable-pangi \ - --enable-gnomevfs \ - --enable-gnomeui \ - --enable-xinerama \ - --enable-ctl \ - --enable-extensions \ - --enable-system-cairo \ - --enable-svg \ - --enable-application=browser +%if %{with tests} +ac_add_options --enable-tests +%else +ac_add_options --disable-tests +%endif +ac_add_options --disable-composer +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 +ac_add_options --disable-xprint +ac_add_options --enable-canvas +ac_add_options --enable-crypto +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-mathml +ac_add_options --enable-pango +ac_add_options --enable-reorder +ac_add_options --enable-single-profile +ac_add_options --enable-strip +ac_add_options --enable-strip-libs +ac_add_options --enable-svg +ac_add_options --enable-system-cairo +ac_add_options --enable-xft +ac_add_options --enable-xinerama +ac_add_options --enable-xpctools +ac_add_options --with-pthreads +ac_add_options --with-system-jpeg +ac_add_options --with-system-nspr +ac_add_options --with-system-png +ac_add_options --with-system-zlib +ac_cv_visibility_pragma=no +EOF %{__make} -j1 -f client.mk build \ CC="%{__cc}" \ @@ -394,20 +368,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.156 2006/10/25 11:33:20 cieciwa -- configueration option update - -Revision 1.155 2006/10/25 10:48:13 cieciwa -- %%configure2_13 - -Revision 1.154 2006/10/25 10:40:24 cieciwa -- uses %{__autoconf} - -Revision 1.153 2006/10/25 10:35:12 cieciwa -- updated to version 2.0, -- release 0.1, -- used %configure -NFY +Revision 1.157 2006/10/26 10:52:53 cieciwa +- back to mozilla-firefox 1.5.0.7 - Firefox 2.0 is in branch DEVEL Revision 1.152 2006/09/26 19:47:16 glen - exact mktemp dep ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.156&r2=1.157&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
