SPECS (DEVEL): mozilla-firefox.spec - %build taken from HEAD (thx....

[blekot]

Author: blekot                       Date: Sat Jan 14 17:43:40 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- %build taken from HEAD (thx. Patrys)
- rel 2.1

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.95.2.15 -> 1.95.2.16) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.95.2.15 SPECS/mozilla-firefox.spec:1.95.2.16
--- SPECS/mozilla-firefox.spec:1.95.2.15	Sat Jan 14 17:11:08 2006
+++ SPECS/mozilla-firefox.spec	Sat Jan 14 18:43:34 2006
@@ -18,7 +18,7 @@
 Summary(pl):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox
 Version:	1.5
-Release:	2
+Release:	2.1
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
@@ -108,61 +108,79 @@
 %patch3 -p1
 
 %build
+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 MOZ_PHOENIX="1"
-export BUILD_OFFICIAL="1"
-export MOZILLA_OFFICIAL="1"
 
 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
-%configure2_13 \
+
+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
-	--disable-composer \
-	--disable-dtd-debug \
-	--disable-freetype \
-	%{!?with_gnome:--disable-gnomevfs --disable-gnomeui} \
-	--disable-installer \
-	--disable-jsd \
-	--disable-ldap \
-	--disable-mailnews \
 %if %{with tests}
-	--enable-tests \
+ac_add_options --enable-tests
 %else
-	--disable-tests \
+ac_add_options --disable-tests
 %endif
-	--disable-xprint \
-	--enable-application=browser \
-	--enable-crypto \
-	--enable-mathml \
-	--enable-optimize="%{rpmcflags}" \
-	--enable-reorder \
-	--enable-strip \
-	--enable-strip-libs \
-	--enable-xinerama \
-	--enable-default-toolkit="gtk2" \
-	--enable-pango \
-	--enable-system-cairo \
-	--enable-svg \
-	--enable-canvas \
-	--enable-xft \
-	--with-pthreads \
-	--with-system-nspr \
-	--with-system-jpeg \
-	--with-system-png \
-	--with-system-zlib \
-	--enable-single-profile \
-	--disable-profilesharing \
-	--enable-extensions=all
+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-crypto
+ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-mathml
+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-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
+EOF
 
-%{__make}
+%{__make} -j1 -f client.mk build \
+	CC="%{__cc}" \
+	CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -345,6 +363,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95.2.16  2006/01/14 17:43:34  blekot
+- %build taken from HEAD (thx. Patrys)
+- rel 2.1
+
 Revision 1.95.2.15  2006/01/14 16:11:08  blekot
 - more TODO (more bugs) :>
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.95.2.15&r2=1.95.2.16&f=u