- rel 2; pass bindir/libdir/datadir/etc macros

[packages/firefox.git] / mozilla-firefox.spec

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index d0ea213b06ef9c4994d2d007b0cdfd227c310ce9..e6b2304cfb191a1de93db2d4d13530a77963345a 100644 (file)
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -24,7 +24,7 @@ Summary:      Mozilla Firefox web browser
 Summary(pl):   Mozilla Firefox - przegl±darka WWW
 Name:          mozilla-firefox
 Version:       1.0.7
-Release:       0.1
+Release:       2
 License:       MPL/LGPL
 Group:         X11/Applications/Networking
 Source0:       http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
@@ -47,6 +47,9 @@ BuildRequires:        freetype-devel >= 2.1.3
 BuildRequires: freetype-devel < 1:2.1.8
 BuildConflicts:        freetype-devel = 2.1.8
 %endif
+BuildRequires: gnome-vfs2-devel
+BuildRequires: libgnome-devel >= 2.0
+BuildRequires: GConf2-devel
 BuildRequires: gtk+2-devel >= 1:2.0.0
 BuildRequires: heimdal-devel >= 0.7
 BuildRequires: libIDL-devel >= 0.8.0
@@ -145,13 +148,26 @@ 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 --disable-debug
-ac_add_options --disable-debug-modules
-%else
 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
@@ -185,7 +201,7 @@ ac_add_options --with-system-zlib
 ac_add_options --enable-single-profile
 EOF
 
-%{__make} -f client.mk build \
+%{__make} -j1 -f client.mk build \
        CC="%{__cc}" \
        CXX="%{__cxx}"