X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox.spec;h=0a0eb7ea8f75646c9ee92638c549a8e1093259ba;hb=33f817264b58dc5b02a52e529c1c3bd1b6fe8200;hp=d3a3d1994396240dc24fbe305bbc01aea258bf6a;hpb=f3be32e41b3ea2f97dbcc73cde4b1b1939e8c121;p=packages%2Ffirefox.git

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index d3a3d19..0a0eb7e 100644
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -23,12 +23,12 @@
 Summary:	Mozilla Firefox web browser
 Summary(pl):	Mozilla Firefox - przegl±darka WWW
 Name:		mozilla-firefox
-Version:	1.0.6
-Release:	4
+Version:	1.0.7
+Release:	0.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
-# Source0-md5:	7b4c1d10d478dcb4c52fbbe3e41745d9
+# Source0-md5:	5704a8c36de84b408e069afb0c5bc1df
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
 Patch0:		%{name}-alpha-gcc3.patch
@@ -38,7 +38,6 @@ Patch3:		%{name}-lib_path.patch
 Patch4:		%{name}-freetype.patch
 Patch5:		%{name}-searchplugins.patch
 Patch6:		%{name}-gcc-bugs.patch
-Patch7:		%{name}-1.0.6-GLSA105396.patch
 URL:		http://www.mozilla.org/projects/firefox/
 BuildRequires:	automake
 %if %{with ft218}
@@ -124,60 +123,71 @@ cd mozilla
 %{?with_ft218:%patch4 -p1}
 %patch5 -p0
 %patch6 -p0
-%patch7 -p1
 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`"
-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
+
+echo << 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 --enable-optimize="%{rpmcflags}"
 %if %{?debug:1}0
-	--enable-debug \
-	--enable-debug-modules \
+ac_add_options --disable-debug
+ac_add_options --disable-debug-modules
 %else
-	--disable-debug \
-	--disable-debug-modules \
+ac_add_options --enable-debug
+ac_add_options --enable-debug-modules
 %endif
-	--disable-composer \
-	--disable-dtd-debug \
-	--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-crypto \
-	--enable-freetype2 \
-	--enable-mathml \
-	--enable-optimize="%{rpmcflags}" \
-	--enable-reorder \
-	--enable-strip \
-	--enable-strip-libs \
-	--enable-xinerama \
-	--enable-xft \
-	--enable-default-toolkit="gtk2" \
-	--with-pthreads \
-	--with-system-nspr \
-	--with-system-jpeg \
-	--with-system-png \
-	--with-system-zlib \
-	--enable-single-profile \
-	--disable-profilesharing \
-	--enable-extensions=default
-
-%{__make}
+ac_add_options --disable-composer
+ac_add_options --disable-dtd-debug
+ac_add_options --disable-installer
+ac_add_options --disable-jsd
+ac_add_options --disable-ldap
+ac_add_options --disable-mailnews
+ac_add_options --disable-xprint
+ac_add_options --disable-profilesharing
+ac_add_options --enable-xpctools
+ac_add_options --enable-native-uconv
+ac_add_options --enable-crypto
+ac_add_options --enable-freetype2
+ac_add_options --enable-mathml
+ac_add_options --enable-reorder
+ac_add_options --enable-strip
+ac_add_options --enable-strip-libs
+ac_add_options --enable-xinerama
+ac_add_options --enable-xft
+ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --with-pthreads
+ac_add_options --with-system-nspr
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
+ac_add_options --enable-single-profile
+EOF
+
+%{__make} -f client.mk build \
+	CC="%{__cc}" \
+	CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT