X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffirefox.git;a=blobdiff_plain;f=mozilla-firefox.spec;h=b50b1f81ce90f2bd36c96236b8517e34077a363f;hp=ca1fa336fb73b00f445288cf950f54d375d57606;hb=31713d158311a88fec0aa644c380792864dcfecc;hpb=c0bec9dd5e33f07234a73e6ed38def8af6616adc

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index ca1fa33..b50b1f8 100644
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -7,27 +7,30 @@
 # Conditional build:
 %bcond_with	tests	# enable tests (whatever they check)
 %bcond_without	gnome	# disable all GNOME components (gnomevfs, gnome, gnomeui)
+%bcond_with	tidy	# enable htmlvalidator extension (tidy)
+#
+%define		_tidy_ver		0.839
+%define		_firefox_ver	2.0.0.4
 #
 Summary:	Firefox Community Edition web browser
 Summary(pl.UTF-8):	Firefox Community Edition - przeglądarka WWW
 Name:		mozilla-firefox
-Version:	2.0.0.3
+Version:	2.0.0.4
 Release:	1
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
-# Source0-md5:	24398e3d98673a2a92a01a8f771ca12a
-Source1:	%{name}.desktop
-Source2:	%{name}.sh
+# Source0-md5:	99c14794976b2532addfcd2d836c6bb2
+Source1:	http://users.skynet.be/mgueury/mozilla/tidy_08x_source.zip
+# Source1-md5:	ad63736e9d57de3e6c69696319b34b3b
+Source2:	%{name}.desktop
+Source3:	%{name}.sh
 Patch0:		mozilla-install.patch
 Patch1:		%{name}-lib_path.patch
+Patch2:		%{name}-addon-tidy.patch
 Patch3:		%{name}-nopangoxft.patch
 Patch5:		%{name}-fonts.patch
 Patch69:	%{name}-agent.patch
-# drop as soon as bug is fixed since it's so ugly hack
-# fixing symptoms only
-# https://bugzilla.mozilla.org/show_bug.cgi?id=362462
-Patch6:		mozilla-hack-gcc_4_2.patch
 Patch7:		%{name}-myspell.patch
 # if ac rebuild is needed...
 #PatchX:		%{name}-ac.patch
@@ -37,7 +40,7 @@ BuildRequires:	automake
 BuildRequires:	cairo-devel >= 1.0.0
 %{?with_gnome:BuildRequires:	gnome-vfs2-devel >= 2.0}
 BuildRequires:	gtk+2-devel >= 1:2.0.0
-BuildRequires:	heimdal-devel >= 0.7.1
+BuildRequires:	krb5-devel
 BuildRequires:	libIDL-devel >= 0.8.0
 %{?with_gnome:BuildRequires:	libgnome-devel >= 2.0}
 %{?with_gnome:BuildRequires:	libgnomeui-devel >= 2.2.0}
@@ -47,6 +50,7 @@ BuildRequires:	libstdc++-devel
 BuildRequires:	myspell-devel
 BuildRequires:	nspr-devel >= 1:4.6.3
 BuildRequires:	nss-devel >= 1:3.11.3-3
+%{?with_tidy:BuildRequires:	opensp-devel}
 BuildRequires:	pango-devel >= 1:1.6.0
 BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
@@ -68,13 +72,13 @@ Provides:	wwwbrowser
 Obsoletes:	mozilla-firebird
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# mozilla and firefox provide their own versions
-%define		_noautoreqdep		libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so libxpcom_core.so
+# firefox/thunderbird/seamonkey provide their own versions
+%define		_noautoreqdep		libgkgfx.so libgtkxtbin.so libjsj.so libxpcom_compat.so libxpcom_core.so
 %define		_noautoprovfiles	%{_libdir}/%{name}/components
 # we don't want these to satisfy xulrunner-devel
-%define		_noautoprov			libmozjs.so libxpcom.so libxul.so
+%define		_noautoprov		libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so
 # and as we don't provide them, don't require either
-%define		_noautoreq			libmozjs.so libxpcom.so libxul.so
+%define		_noautoreq		libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so
 
 %define		specflags	-fno-strict-aliasing -fno-tree-vrp -fno-stack-protector
 
@@ -113,18 +117,21 @@ English resources for Firefox Community Edition.
 Anglojęzyczne zasoby dla przeglądarki Firefox Community Edition.
 
 %prep
-%setup -qc
+%setup -qc %{?with_tidy:-a1}
+%if %{with tidy}
+mv mozilla_tidy_source/mozilla/extensions/tidy mozilla/extensions/tidy
+mv mozilla_tidy_source/tidy_extension .
+rm -rf mozilla/extensions/tidy/opensp
+%endif
 cd mozilla
 %patch0 -p1
 %patch1 -p1
+%{?with_tidy:%patch2 -p1}
 %patch3 -p1
 %patch5 -p1
-%patch6 -p2
 %patch7 -p1
 %patch69 -p1
 
-sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
-
 # use system
 #rm -rf mozilla/nsprpub mozilla/security/nss
 
@@ -236,12 +243,12 @@ ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/search
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 
-sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
+sed 's,@LIBDIR@,%{_libdir},' %{SOURCE3} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
 ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
 
 install browser/base/branding/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 # header/development files
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpidl
@@ -275,7 +282,7 @@ EOF
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
+%pretrans
 if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then
 	mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave}
 fi