SPECS (AC-branch): mozilla-firefox.spec - hook in tidy (htmlvalida...
glen
glen at pld-linux.org
Mon Jun 4 17:23:36 CEST 2007
Author: glen Date: Mon Jun 4 15:23:36 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- hook in tidy (htmlvalidator) extension
---- Files affected:
SPECS:
mozilla-firefox.spec (1.160.2.17 -> 1.160.2.18)
---- Diffs:
================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.160.2.17 SPECS/mozilla-firefox.spec:1.160.2.18
--- SPECS/mozilla-firefox.spec:1.160.2.17 Thu May 31 17:57:39 2007
+++ SPECS/mozilla-firefox.spec Mon Jun 4 17:23:30 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): Firefox Community Edition - przeglądarka WWW
@@ -18,19 +22,23 @@
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
Patch6: %{name}-myspell.patch
Patch7: %{name}-agent.patch
# if ac rebuild is needed...
-#PatchX: %{name}-ac.patch
+#PatchX: %{name}-ac.patch
URL: http://www.mozilla.org/projects/firefox/
%{?with_gnome:BuildRequires: GConf2-devel >= 1.2.1}
BuildRequires: XFree86-devel
+%{?with_tidy:BuildRequires: opensp-devel}
BuildRequires: automake
BuildRequires: cairo-devel >= 1.0.0
%{?with_gnome:BuildRequires: gnome-vfs2-devel >= 2.0}
@@ -106,10 +114,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
%patch6 -p1
@@ -228,12 +242,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
@@ -365,6 +379,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.160.2.18 2007/06/04 15:23:30 glen
+- hook in tidy (htmlvalidator) extension
+
Revision 1.160.2.17 2007/05/31 15:57:39 hawk
- updated to 2.0.0.4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.160.2.17&r2=1.160.2.18&f=u
More information about the pld-cvs-commit
mailing list