X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox.spec;h=9e75353c1e590490fc2e0d71f13f598101970e8e;hb=b0b4b1d04a544958261a8546c4a551891ae26890;hp=a62a37dfea818b4e2f1d24bbf697291debc40144;hpb=c14d61402d1f4d22efa081d8742232451f4142ba;p=packages%2Ffirefox.git

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index a62a37d..9e75353 100644
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -1,26 +1,40 @@
+#
+# Conditional build:
+%bcond_with	tests	# enable tests (whatever they check)
+#
 Summary:	Mozilla Firefox web browser
 Summary(pl):	Mozilla Firefox - przegl±darka WWW
 Name:		mozilla-firefox
-Version:	0.8
-Release:	1.1
+Version:	0.9
+Release:	1
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
-Source0:	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/firefox-source-%{version}.tar.bz2
-# Source0-md5:	cdc85152f4219bf3e3f1a8dc46e04654
+Source0:	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/firefox-%{version}-source.tar.bz2
+# Source0-md5:	1dda543d1245db09cea9ad7b9a44146c
 Source1:	%{name}.desktop
 Patch0:		%{name}-alpha-gcc3.patch
+Patch1:		%{name}-nspr.patch
+Patch2:		%{name}-nss.patch
 URL:		http://www.mozilla.org/projects/firefox/
+BuildRequires:	automake
 BuildRequires:	gtk+2-devel >= 2.0.0
-BuildRequires:  libIDL-devel >= 0.8.0
+BuildRequires:	libIDL-devel >= 0.8.0
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libpng-devel >= 1.2.0
 BuildRequires:	libstdc++-devel
+BuildRequires:	nspr-devel >= 1:4.5.0
+BuildRequires:	nss-devel >= 3.8
 BuildRequires:	pango-devel >= 1.1.0
 BuildRequires:	zip
+Requires:	%{name}-lang-resources = %{version}
+Requires:	nspr >= 1:4.5.0
+Requires:	nss >= 3.8
 Obsoletes:	mozilla-firebird
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define	_firefoxdir	%{_libdir}/%{name}
+%define		_firefoxdir	%{_libdir}/%{name}
+# mozilla and firefox provide their own versions
+%define		_noautoreqdep	libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so
 
 %description
 Mozilla Firefox is an open-source web browser, designed for standards
@@ -30,55 +44,73 @@ compliance, performance and portability.
 Mozilla Firefox jest open sourcow± przegl±dark± sieci www, stworzon± z
 my¶l± o zgodno¶ci ze standartami, wydajno¶ci± i przeno¶no¶ci±.
 
+%package lang-en
+Summary:	English resources for Mozilla-firefox
+Summary(pl):	Anglojêzyczne zasoby dla Mozilla-FireFox
+Group:	X11/Applications/Networking
+Requires(post,postun):	%{name} = %{version}-%{release}
+Requires(post,postun):	textutils
+Requires:	%{name} = %{version}-%{release}
+Provides:	%{name}-lang-resources = %{version}-%{release}
+
+%description lang-en
+English resources for Mozilla-firefox
+
+%description lang-en -l pl
+Anglojêzyczne zasoby dla Mozilla-FireFox
+
 %prep
 %setup -q -n mozilla
 %patch0 -p1
-
-### FIXME: Shouldn't the default firefox config be part of original source ?
-cat <<EOF >.mozconfig
-export MOZ_PHOENIX="1"
-mk_add_options MOZ_PHOENIX="1"
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-png
-ac_add_options --with-system-mng
-ac_add_options --with-pthreads
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-debug-modules
-ac_add_options --disable-xprint
-ac_add_options --disable-mailnews
-ac_add_options --disable-composer
-ac_add_options --disable-ldap
-ac_add_options --disable-jsd
-ac_add_options --disable-dtd-debug
-ac_add_options --disable-gtktest
-ac_add_options --disable-freetypetest
-ac_add_options --disable-installer
-ac_add_options --enable-plaintext-editor-only
-ac_add_options --enable-optimize="%{optflags}"
-ac_add_options --enable-crypto
-ac_add_options --enable-strip
-ac_add_options --enable-strip-libs
-ac_add_options --enable-reorder
-ac_add_options --enable-mathml
-ac_add_options --enable-xinerama
-ac_add_options --enable-extensions="pref,cookie,wallet"
-ac_add_options --enable-freetype2
-ac_add_options --enable-xft
-ac_add_options --enable-default-toolkit="gtk2"
-EOF
+%patch1 -p1
+%patch2 -p1
 
 %build
-#export MOZ_PHOENIX="1"
-#configure
-#{__make} %{?_smp_mflags}
-
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
+export CFLAGS="%{rpmcflags}"
+export CXXFLAGS="%{rpmcflags}"
 export MOZ_PHOENIX="1"
 
-%{__make} -f client.mk build
+cp -f /usr/share/automake/config.* build/autoconf
+cp -f /usr/share/automake/config.* nsprpub/build/autoconf
+cp -f /usr/share/automake/config.* directory/c-sdk/config/autoconf
+%configure2_13 \
+%if %{?debug:1}0
+	--enable-debug \
+	--enable-debug-modules \
+%else
+	--disable-debug \
+	--disable-debug-modules \
+%endif
+	--disable-composer \
+	--disable-dtd-debug \
+	--disable-installer \
+	--disable-jsd \
+	--disable-ldap \
+	--disable-mailnews \
+%if %{with tests}
+	--enable-tests \
+%else
+	--disable-tests \
+%endif
+	--disable-xprint \
+	--enable-crypto \
+	--enable-freetype2 \
+	--enable-mathml \
+	--enable-optimize="%{rpmcflags}" \
+	--enable-plaintext-editor-only \
+	--enable-reorder \
+	--enable-strip \
+	--enable-strip-libs \
+	--enable-xinerama \
+	--enable-xft \
+	--enable-default-toolkit="gtk2" \
+	--with-pthreads \
+	--with-system-jpeg \
+	--with-system-nspr \
+	--with-system-png \
+	--with-system-zlib
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -86,7 +118,8 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}}
 
 %{__make} -C xpinstall/packager \
 	MOZ_PKG_APPNAME="mozilla-firefox" \
-	MOZILLA_BIN="\$(DIST)/bin/firefox-bin"
+	MOZILLA_BIN="\$(DIST)/bin/firefox-bin" \
+	EXCLUDE_NSPR_LIBS=1
 
 #install -m0755 %{name}.sh $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
 ln -sf %{_firefoxdir}/firefox $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
@@ -99,24 +132,43 @@ install browser/base/skin/Throbber.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-fir
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
-grep locale $RPM_BUILD_ROOT%{_firefoxdir}/chrome/installed-chrome.txt > $RPM_BUILD_ROOT%{_firefoxdir}/chrome/firefox-en-US-installed-chrome.txt
-grep -v locale $RPM_BUILD_ROOT%{_firefoxdir}/chrome/installed-chrome.txt > $RPM_BUILD_ROOT%{_firefoxdir}/chrome/firefox-misc-installed-chrome.txt
+grep locale $RPM_BUILD_ROOT%{_firefoxdir}/chrome/installed-chrome.txt > $RPM_BUILD_ROOT%{_firefoxdir}/chrome/%{name}-en-US-installed-chrome.txt
+grep -v locale $RPM_BUILD_ROOT%{_firefoxdir}/chrome/installed-chrome.txt > $RPM_BUILD_ROOT%{_firefoxdir}/chrome/%{name}-misc-installed-chrome.txt
+
+rm -rf US classic comm embed-sample en-{US,mac,unix,win} modern pipnss pippki toolkit
+rm -f en-win.jar en-mac.jar embed-sample.jar modern.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 umask 022
-cd %{_chromedir}
-cat *-installed-chrome.txt >installed-chrome.txt
+cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt
+
+%postun
+if [ "$1" != "0" ]; then
+	umask 022
+	cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt
+fi
+
+%post lang-en
+umask 022
+cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt
+
+%postun lang-en
+umask 022
+cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt
 
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 %dir %{_firefoxdir}
 %{_firefoxdir}/res
-%{_firefoxdir}/chrome
-%{_firefoxdir}/components
+%dir %{_firefoxdir}/components
+%attr(755,root,root) %{_firefoxdir}/components/*.so
+%{_firefoxdir}/components/*.js
+%{_firefoxdir}/components/*.xpt
+%{_firefoxdir}/components/myspell
 %{_firefoxdir}/plugins
 %{_firefoxdir}/searchplugins
 %{_firefoxdir}/icons
@@ -132,8 +184,28 @@ cat *-installed-chrome.txt >installed-chrome.txt
 %ifarch %{ix86}
 %attr(755,root,root) %{_firefoxdir}/elf-dynstr-gc
 %endif
-%attr(755,root,root) %{_firefoxdir}/libsoftokn3.chk
-%attr(755,root,root) %{_firefoxdir}/shlibsign
 %{_firefoxdir}/bloaturls.txt
 %{_pixmapsdir}/*
 %{_desktopdir}/*
+
+%dir %{_firefoxdir}/chrome
+%{_firefoxdir}/chrome/browser.jar
+# -chat subpackage?
+#%{_firefoxdir}/chrome/chatzilla.jar
+%{_firefoxdir}/chrome/classic.jar
+%{_firefoxdir}/chrome/comm.jar
+%{_firefoxdir}/chrome/content-packs.jar
+%{_firefoxdir}/chrome/help.jar
+# -dom-inspector subpackage?
+#%{_firefoxdir}/chrome/inspector.jar
+%{_firefoxdir}/chrome/modern.jar
+%{_firefoxdir}/chrome/pip*.jar
+%{_firefoxdir}/chrome/toolkit.jar
+%{_firefoxdir}/chrome/mozilla-firefox-misc-installed-chrome.txt
+
+%files lang-en
+%defattr(644,root,root,755)
+%{_firefoxdir}/chrome/en-US.jar
+%{_firefoxdir}/chrome/en-unix.jar
+%{_firefoxdir}/chrome/US.jar
+%{_firefoxdir}/chrome/mozilla-firefox-en-US-installed-chrome.txt