X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox.spec;h=ecb64526f59ca171885cd2743e4ae437774400cc;hb=e66057308fd05f524e590c948ed83145747fd24f;hp=2fbee409baea3f6259271065c71b743b1c7129b9;hpb=590149f913586fe1d2b6569398adc342be120905;p=packages%2Ffirefox.git

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index 2fbee40..ecb6452 100644
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -3,59 +3,57 @@
 # - 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
-#
+# - rpm upgrade is broken. First you need uninstall Firefox 1.0.x. 
 # Conditional build:
 %bcond_with	tests	# enable tests (whatever they check)
-%bcond_without	ft218	# compile with freetype < 2.1.8
+%bcond_without	gnome	# disable all GNOME components (gnomevfs, gnome, gnomeui)
 #
 Summary:	Mozilla Firefox web browser
 Summary(pl):	Mozilla Firefox - przegl±darka WWW
 Name:		mozilla-firefox
-Version:	1.0.6
-Release:	1
+Version:	1.5
+Release:	4
 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:	fa915ddcadecda30ed3e13694f26a779
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
-Patch0:		%{name}-alpha-gcc3.patch
-Patch1:		%{name}-gfx.patch
-Patch2:		%{name}-nss.patch
-Patch3:		%{name}-lib_path.patch
-Patch4:		%{name}-freetype.patch
-Patch5:		%{name}-searchplugins.patch
-Patch6:		%{name}-gcc-bugs.patch
+Patch0:		%{name}-nss.patch
+Patch1:		%{name}-lib_path.patch
+Patch2:		%{name}-nss-system-nspr.patch
+Patch3:		%{name}-nopangoxft.patch
+Patch4:		%{name}-name.patch
+# official patches
+# certain ui operations cause prolonged hang (cpu at 100%)
+Patch100:	%{name}-bug305970.patch
+# UPDATE or DROP?
+#PatchX:		%{name}-searchplugins.patch
 URL:		http://www.mozilla.org/projects/firefox/
+%{?with_gnome:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	automake
-%if %{with ft218}
-BuildRequires:	freetype-devel >= 1:2.1.9
-%else
-BuildRequires:	freetype-devel >= 2.1.3
-BuildRequires:	freetype-devel < 1:2.1.8
-BuildConflicts:	freetype-devel = 2.1.8
-%endif
+BuildRequires:	cairo-devel >= 1.0.0
 BuildRequires:	gtk+2-devel >= 1:2.0.0
-BuildRequires:	heimdal-devel >= 0.7
+BuildRequires:	heimdal-devel >= 0.7.1
+%{?with_gnome:BuildRequires:	gnome-vfs2-devel >= 2.0}
 BuildRequires:	libIDL-devel >= 0.8.0
+%{?with_gnome:BuildRequires:	libgnome-devel >= 2.0}
+%{?with_gnome:BuildRequires:	libgnomeui-devel >= 2.2.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-modules
+BuildRequires:	pango-devel >= 1:1.6.0
+BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
 BuildRequires:	zip
 Requires:	%{name}-lang-resources = %{version}
-%if %{with ft218}
-Requires:	freetype >= 1:2.1.3
-%else
-Requires:	freetype >= 2.1.3
-Conflicts:	freetype = 2.1.8
-%endif
 Requires:	nspr >= 1:4.6-0.20041030.1
 Requires:	nss >= 3.8
+# for /etc/ld.so.conf.d
+Requires:	glibc >= 6:2.3.5-7.6
+Requires(post,postun):	/sbin/ldconfig
 Obsoletes:	mozilla-firebird
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -107,69 +105,98 @@ Angloj
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%{?with_ft218:%patch4 -p1}
-%patch5 -p0
-%patch6 -p0
+%patch4 -p1
+
+# official patches
+%patch100 -p1
 sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
 
 %build
+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
+
+cat << 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 --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
-	--enable-debug \
-	--enable-debug-modules \
+ac_add_options --enable-debug
+ac_add_options --enable-debug-modules
 %else
-	--disable-debug \
-	--disable-debug-modules \
+ac_add_options --disable-debug
+ac_add_options --disable-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=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,gnomevfs,negotiateauth
-	
+ac_add_options --disable-composer
+ac_add_options --disable-dtd-debug
+ac_add_options --disable-freetype2
+ac_add_options --disable-installer
+ac_add_options --disable-jsd
+ac_add_options --disable-ldap
+ac_add_options --disable-mailnews
+ac_add_options --disable-profilesharing
+ac_add_options --disable-xprint
+ac_add_options --enable-canvas
+ac_add_options --enable-crypto
+ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-mathml
+ac_add_options --enable-pango
+ac_add_options --enable-reorder
+ac_add_options --enable-single-profile
+ac_add_options --enable-strip
+ac_add_options --enable-strip-libs
+ac_add_options --enable-svg
+ac_add_options --enable-system-cairo
+ac_add_options --enable-xft
+ac_add_options --enable-xinerama
+ac_add_options --enable-xpctools
+ac_add_options --with-pthreads
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-nspr
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
+EOF
 
-%{__make}
+%{__make} -j1 -f client.mk build \
+	CC="%{__cc}" \
+	CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d \
-	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
+	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}{,extensions}} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
 	$RPM_BUILD_ROOT{%{_includedir}/%{name}/idl,%{_pkgconfigdir}}
+# extensions dir is needed (it can be empty)
 	
 %{__make} -C xpinstall/packager \
 	MOZ_PKG_APPNAME="mozilla-firefox" \
@@ -178,16 +205,16 @@ install -d \
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
 
-tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-firefox-*-linux-gnu.tar.gz
+tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-firefox-*linux*.tar.gz
 
-install other-licenses/branding/firefox/content/icon32.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png
+install other-licenses/branding/firefox/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png
 #install -m0644 bookmarks.html $RPM_BUILD_ROOT%{_firefoxdir}/defaults/profile/
 #install -m0644 bookmarks.html $RPM_BUILD_ROOT%{_firefoxdir}/defaults/profile/US/
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
-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
+#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
 rm -f en-win.jar en-mac.jar embed-sample.jar modern.jar
@@ -196,7 +223,6 @@ rm -f en-win.jar en-mac.jar embed-sample.jar modern.jar
 cp -rfL dist/include/*	$RPM_BUILD_ROOT%{_includedir}/%{name}
 cp -rfL dist/idl/*	$RPM_BUILD_ROOT%{_includedir}/%{name}/idl
 
-install dist/bin/regchrome $RPM_BUILD_ROOT%{_bindir}
 install dist/bin/regxpcom $RPM_BUILD_ROOT%{_bindir}
 install dist/bin/xpidl $RPM_BUILD_ROOT%{_bindir}
 install dist/bin/xpt_dump $RPM_BUILD_ROOT%{_bindir}
@@ -227,7 +253,8 @@ sed -i -e '/Cflags:/{/{includedir}\/dom/!s,$, -I${includedir}/dom,}' \
 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
+#There is no such files (*-installed-chrome.txt). IMO obsolete.
+#cat %{_firefoxdir}/chrome/*-installed-chrome.txt > %{_firefoxdir}/chrome/installed-chrome.txt
 rm -f %{_firefoxdir}/chrome/{chrome.rdf,overlayinfo/*/*/*.rdf}
 rm -f %{_firefoxdir}/components/{compreg,xpti}.dat
 MOZILLA_FIVE_HOME=%{_firefoxdir}
@@ -242,18 +269,28 @@ LD_LIBRARY_PATH=%{_firefoxdir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
 unset TMPDIR TMP || :
-%{_firefoxdir}/regxpcom
-%{_firefoxdir}/regchrome
-%{_firefoxdir}/firefox -register
+MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/regxpcom
+MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/firefox -register
 EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/ldconfig
 %{_sbindir}/firefox-chrome+xpcom-generate
+%banner %{name} -e <<EOF
+###################################################################
+#                                                                 #
+# NOTICE:                                                         #
+# If you have problem with upgrade old mozilla-firefox 1.0.x, you #
+# should remove it first.                                         #
+#                                                                 #
+###################################################################
+EOF
 
 %postun
+/sbin/ldconfig
 if [ "$1" != "0" ]; then
 	%{_sbindir}/firefox-chrome+xpcom-generate
 fi
@@ -266,13 +303,13 @@ if [ "$1" == "0" ]; then
 	rm -rf %{_firefoxdir}/extensions
 fi
 
-%post lang-en
-umask 022
-cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt
+#%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
+#%postun lang-en
+#umask 022
+#cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt
 
 %files
 %defattr(644,root,root,755)
@@ -289,6 +326,7 @@ cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installe
 %{_firefoxdir}/icons
 %{_firefoxdir}/defaults
 %{_firefoxdir}/greprefs
+%dir %{_firefoxdir}/extensions
 %dir %{_firefoxdir}/init.d
 %attr(755,root,root) %{_firefoxdir}/*.so
 %attr(755,root,root) %{_firefoxdir}/*.sh
@@ -296,34 +334,23 @@ cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installe
 %attr(755,root,root) %{_firefoxdir}/f*
 %attr(755,root,root) %{_firefoxdir}/reg*
 %attr(755,root,root) %{_firefoxdir}/x*
-%attr(755,root,root) %{_firefoxdir}/T*
-%ifarch %{ix86}
-%attr(755,root,root) %{_firefoxdir}/elf-dynstr-gc
-%endif
-%{_firefoxdir}/bloaturls.txt
 %{_pixmapsdir}/*
 %{_desktopdir}/*
 
 %dir %{_firefoxdir}/chrome
-%{_firefoxdir}/chrome/browser.jar
+%{_firefoxdir}/chrome/*.jar
+%{_firefoxdir}/chrome/*.manifest
 # -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
+#%{_firefoxdir}/chrome/inspector.jar
+#%{_firefoxdir}/chrome/mozilla-firefox-misc-installed-chrome.txt
 %dir %{_firefoxdir}/chrome/icons
 %{_firefoxdir}/chrome/icons/default
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/regchrome
 %attr(755,root,root) %{_bindir}/regxpcom
 %attr(755,root,root) %{_bindir}/xpidl
 %attr(755,root,root) %{_bindir}/xpt_dump
@@ -334,4 +361,5 @@ cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installe
 %files lang-en
 %defattr(644,root,root,755)
 %{_firefoxdir}/chrome/en-US.jar
-%{_firefoxdir}/chrome/mozilla-firefox-en-US-installed-chrome.txt
+%{_firefoxdir}/chrome/en-US.manifest
+#%{_firefoxdir}/chrome/mozilla-firefox-en-US-installed-chrome.txt