X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox.spec;h=49cd43c64820671a0449d5d3300b4c24043e99af;hb=3d036ae8b38aa2bb7dcf4f4a8fc0c63c49db59e8;hp=c5a6c9667ef0ae890ff18905faca491bf7494aeb;hpb=38320fc2628c215519106efcac1a19f6a9488450;p=packages%2Ffirefox.git

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index c5a6c96..49cd43c 100644
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -13,18 +13,19 @@
 Summary:	Mozilla Firefox web browser
 Summary(pl):	Mozilla Firefox - przegl±darka WWW
 Name:		mozilla-firefox
-Version:	1.0
-Release:	0.1
+Version:	1.0.1
+Release:	1
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
-Source0:	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/source/firefox-1.0-source.tar.bz2
-# Source0-md5:	49c16a71f4de014ea471be81e46b1da8
+Source0:	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
+# Source0-md5:	ebaea974fea9460ab7050fff76b41cb1
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
 Patch0:		%{name}-alpha-gcc3.patch
-Patch1:		%{name}-nss.patch
-Patch2:		%{name}-lib_path.patch
-Patch3:		%{name}-freetype.patch
+Patch1:		%{name}-gfx.patch
+Patch2:		%{name}-nss.patch
+Patch3:		%{name}-lib_path.patch
+Patch4:		%{name}-freetype.patch
 URL:		http://www.mozilla.org/projects/firefox/
 BuildRequires:	automake
 %if %{with ft218}
@@ -39,8 +40,10 @@ BuildRequires:	libIDL-devel >= 0.8.0
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libpng-devel >= 1.2.0
 BuildRequires:	libstdc++-devel
+BuildRequires:	nspr-devel >= 1:4.6-0.20041030.1
 BuildRequires:	nss-devel >= 3.8
 BuildRequires:	pango-devel >= 1:1.1.0
+BuildRequires:	perl(Time::localtime)
 BuildRequires:	zip
 Requires:	%{name}-lang-resources = %{version}
 %if %{with ft218}
@@ -50,15 +53,15 @@ Requires:	freetype >= 2.1.3
 Requires:	freetype < 1:2.1.8
 Conflicts:	freetype = 2.1.8
 %endif
+Requires:	nspr >= 1:4.6-0.20041030.1
 Requires:	nss >= 3.8
-PreReq:		XFree86-Xvfb
 Obsoletes:	mozilla-firebird
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %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 libnspr4.so
-%define		_noautoprovfiles libnspr4.so libplc4.so libplds4.so
+%define		_noautoreqdep		libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so
+%define		_noautoprovfiles	libplc4.so libplds4.so
 
 %description
 Mozilla Firefox is an open-source web browser, designed for standards
@@ -88,7 +91,8 @@ Angloj
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%{?with_ft218:%patch3 -p1}
+%patch3 -p1
+%{?with_ft218:%patch4 -p1}
 
 %build
 export CFLAGS="%{rpmcflags}"
@@ -132,18 +136,20 @@ cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
 	--enable-xft \
 	--enable-default-toolkit="gtk2" \
 	--with-pthreads \
-	--without-system-nspr \
+	--with-system-nspr \
 	--with-system-jpeg \
 	--with-system-png \
 	--with-system-zlib \
 	--enable-single-profile \
-	--disable-profilesharing
+	--disable-profilesharing \
+	--enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,gnomevfs,negotiateauth
+	
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}}
 
 %{__make} -C xpinstall/packager \
 	MOZ_PKG_APPNAME="mozilla-firefox" \
@@ -167,14 +173,12 @@ grep -v locale $RPM_BUILD_ROOT%{_firefoxdir}/chrome/installed-chrome.txt > $RPM_
 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
+cat << EOF > $RPM_BUILD_ROOT%{_sbindir}/firefox-chrome+xpcom-generate
+#!/bin/sh
 umask 022
 cat %{_firefoxdir}/chrome/*-installed-chrome.txt > %{_firefoxdir}/chrome/installed-chrome.txt
-
-unset MOZILLA_FIVE_HOME || :
+rm -f %{_firefoxdir}/chrome/{chrome.rdf,overlayinfo/*/*/*.rdf}
+rm -f %{_firefoxdir}/components/{compreg,xpti}.dat
 MOZILLA_FIVE_HOME=%{_firefoxdir}
 export MOZILLA_FIVE_HOME
 
@@ -186,53 +190,28 @@ export PATH
 LD_LIBRARY_PATH=%{_firefoxdir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
-/sbin/ldconfig || :
-
-%{_firefoxdir}/regxpcom >/dev/null  || echo "E: regxpcom was exited: $?" >&2
-%{_firefoxdir}/regchrome >/dev/null || echo "E: regchrome was exited: $?" >&2
-
-TDIR=`mktemp -d /tmp/mozilla-firefox-pkg.XXXXXX` || exit 1
-HOME="$TDIR"
-export TDIR HOME
-
-mkdir -p $TDIR/.mozilla/firefox/default
-cp -rf %{_firefoxdir}/defaults/profile/* $TDIR/.mozilla/firefox/default
-
-# preseed profiles.ini
-cat > $TDIR/.mozilla/firefox/profiles.ini <<EOF
-[General]
-StartWithLastProfile=1
-
-[Profile0]
-Name=default
-IsRelative=1
-Path=default
-
+%{_firefoxdir}/regxpcom
+%{_firefoxdir}/regchrome
+%{_firefoxdir}/firefox -register
 EOF
 
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-( \
-	/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate >/dev/null 2>&1 & \
-	xvfb_pid=${!}; \
-	DISPLAY=:69 %{_firefoxdir}/firefox-bin -list-global-items >/dev/null 2>&1 & \
-	sleep 15; \
-	kill ${xvfb_pid} >/dev/null 2>&1 \
-)
-
-rm -rf $TDIR
+%post
+%{_sbindir}/firefox-chrome+xpcom-generate
 
 %postun
 if [ "$1" != "0" ]; then
-	umask 022
-	cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt
+	%{_sbindir}/firefox-chrome+xpcom-generate
 fi
 
 %preun
 if [ "$1" == "0" ]; then
-  rm -rf %{_firefoxdir}/chrome/overlayinfo
-  rm -rf %{_firefoxdir}/components
-  rm -f  %{_firefoxdir}/chrome/*.rdf
-  rm -rf %{_firefoxdir}/extensions
+	rm -rf %{_firefoxdir}/chrome/overlayinfo
+	rm -f  %{_firefoxdir}/chrome/*.rdf
+	rm -rf %{_firefoxdir}/components
+	rm -rf %{_firefoxdir}/extensions
 fi
 
 %post lang-en
@@ -246,13 +225,13 @@ cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installe
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_sbindir}/*
 %dir %{_firefoxdir}
 %{_firefoxdir}/res
 %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
@@ -279,14 +258,15 @@ cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installe
 #%{_firefoxdir}/chrome/chatzilla.jar
 %{_firefoxdir}/chrome/classic.jar
 %{_firefoxdir}/chrome/comm.jar
-%{_firefoxdir}/chrome/content-packs.jar
+#%{_firefoxdir}/chrome/content-packs.jar
 %{_firefoxdir}/chrome/help.jar
 # -dom-inspector subpackage?
-#%{_firefoxdir}/chrome/inspector.jar
+%{_firefoxdir}/chrome/inspector.jar
 %{_firefoxdir}/chrome/modern.jar
 %{_firefoxdir}/chrome/pip*.jar
 %{_firefoxdir}/chrome/toolkit.jar
 %{_firefoxdir}/chrome/mozilla-firefox-misc-installed-chrome.txt
+%dir %{_firefoxdir}/chrome/icons
 %{_firefoxdir}/chrome/icons/default
 
 %files lang-en