X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox.spec;h=e197657b6cec308c7ee2a7587db460640b460ae7;hb=0d00fa1b6c4d6186f03e19ef6ed7e384a926c115;hp=c20594c3cd148df4b426cf5a5965f50aafd87fca;hpb=998f1ebbcbf0a473f4b0b2a08e2776815768b4ce;p=packages%2Ffirefox.git

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index c20594c..e197657 100644
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -1,24 +1,30 @@
 #
+# TODO:
+# - handle locales differently (runtime, since it's possible to do)
+# - see ftp://ftp.debian.org/debian/pool/main/m/mozilla-firefox/*diff*
+#   for hints how to make locales and other stuff like extensions working
+#
 # 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:	3
+Version:	0.9.2
+Release:	1.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:	eb6edaa488fb596b08d4ba50072546e1
 Source1:	%{name}.desktop
 Patch0:		%{name}-alpha-gcc3.patch
 Patch1:		%{name}-nspr.patch
 Patch2:		%{name}-nss.patch
-Patch3:		%{name}-amd64.patch
+Patch3:		%{name}-lib_path.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
@@ -29,6 +35,7 @@ BuildRequires:	zip
 Requires:	%{name}-lang-resources = %{version}
 Requires:	nspr >= 1:4.5.0
 Requires:	nss >= 3.8
+PreReq:		XFree86-Xvfb
 Obsoletes:	mozilla-firebird
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,15 +74,15 @@ Angloj
 %patch3 -p1
 
 %build
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
+export CFLAGS="%{rpmcflags}"
+export CXXFLAGS="%{rpmcflags}"
 export MOZ_PHOENIX="1"
 
 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 %{with debug}
+%if %{?debug:1}0
 	--enable-debug \
 	--enable-debug-modules \
 %else
@@ -97,7 +104,7 @@ cp -f /usr/share/automake/config.* directory/c-sdk/config/autoconf
 	--enable-crypto \
 	--enable-freetype2 \
 	--enable-mathml \
-	--enable-optimize="%{optflags}" \
+	--enable-optimize="%{rpmcflags}" \
 	--enable-plaintext-editor-only \
 	--enable-reorder \
 	--enable-strip \
@@ -146,12 +153,24 @@ rm -rf $RPM_BUILD_ROOT
 umask 022
 cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt
 
+/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate >/dev/null 2>&1 & \
+	DISPLAY=:69 %{_bindir}/mozilla-firefox -install-global-extension -install-global-theme >/dev/null 2>&1 & \
+	sleep 5
+
 %postun
 if [ "$1" != "0" ]; then
 	umask 022
 	cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt
 fi
 
+%preun
+if [ "$1" == "0" ]; then
+  rm -rf %{_firefoxdir}/chrome/overlayinfo
+  rm -rf %{_firefoxdir}/components
+  rm -f  %{_firefoxdir}/chrome/*.rdf
+  rm -rf %{_firefoxdir}/extensions
+fi
+
 %post lang-en
 umask 022
 cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt