From: hawk <hawk@pld-linux.org>
Date: Sat, 21 Jun 2008 14:43:41 +0000 (+0000)
Subject: - added branding and prefs patches, see their commitlogs for details
X-Git-Tag: auto/th/mozilla-firefox-3_0-3~9
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=29b1606856fc0bbebb106530ffb96ec04488d91f;p=packages%2Ffirefox.git

- added branding and prefs patches, see their commitlogs for details
  on what has been changed

Changed files:
    mozilla-firefox.spec -> 1.247
---

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index 10d91d9..9713d99 100644
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -4,7 +4,6 @@
 # - see ftp://ftp.debian.org/debian/pool/main/m/mozilla-firefox/*diff*
 #   for hints how to make locales
 # - make it more pld-like (bookmarks, default page etc..)
-# - disable some options by default (fraud detection, application update etc.)
 # - review Rs/BRs for xulrunner build, surely not everything here is needed
 # - fix/remove noauto{dep,prov,req} for xulrunner build
 #
@@ -25,7 +24,7 @@ Summary:	Firefox Community Edition web browser
 Summary(pl.UTF-8):	Firefox Community Edition - przeglądarka WWW
 Name:		mozilla-firefox
 Version:	3.0
-Release:	2.2
+Release:	2.3
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
@@ -37,6 +36,8 @@ Patch1:		%{name}-gcc3.patch
 Patch2:		%{name}-agent.patch
 Patch3:		%{name}-agent-ac.patch
 Patch4:		%{name}-ti-agent.patch
+Patch5:		%{name}-branding.patch
+Patch6:		%{name}-prefs.patch
 URL:		http://www.mozilla.org/projects/firefox/
 %{?with_gnomevfs:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	automake
@@ -137,6 +138,9 @@ cd mozilla
 %patch4 -p1
 %endif
 
+%patch5 -p1
+%patch6 -p1
+
 %build
 cd mozilla
 cp -f %{_datadir}/automake/config.* build/autoconf