SPECS: mozilla-firefox.spec - hook in tidy (htmlvalidator) extension

[glen]

Author: glen                         Date: Mon Jun  4 15:26:44 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- hook in tidy (htmlvalidator) extension

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.195 -> 1.196) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.195 SPECS/mozilla-firefox.spec:1.196
--- SPECS/mozilla-firefox.spec:1.195	Sun Jun  3 10:10:41 2007
+++ SPECS/mozilla-firefox.spec	Mon Jun  4 17:26:37 2007
@@ -8,6 +8,10 @@
 # Conditional build:
 %bcond_with	tests	# enable tests (whatever they check)
 %bcond_without	gnome	# disable all GNOME components (gnomevfs, gnome, gnomeui)
+%bcond_with	tidy	# disable 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
@@ -18,10 +22,13 @@
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
 # Source0-md5:	99c14794976b2532addfcd2d836c6bb2
-Source1:	%{name}.desktop
-Source2:	%{name}.sh
+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
@@ -44,6 +51,7 @@
 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
@@ -110,10 +118,16 @@
 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
+%patch2 -p1
 %patch3 -p1
 %patch5 -p1
 %patch7 -p1
@@ -230,12 +244,12 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 
-sed 's, at LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
+sed 's, at 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
@@ -367,6 +381,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.196  2007/06/04 15:26:37  glen
+- hook in tidy (htmlvalidator) extension
+
 Revision 1.195  2007/06/03 08:10:41  qboosh
 - no need to _noautoreqdep sonames already eliminated by _noautoreq
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.195&r2=1.196&f=u