From 6b1581cfd97cfbe0b8d3b498fbcc24bcca5957a0 Mon Sep 17 00:00:00 2001 From: hawk Date: Sat, 24 May 2008 19:03:18 +0000 Subject: [PATCH] - use %pld_release macro and apply proper agent patch, BR: rpm >= 4.4.9-56 Changed files: mozilla-firefox.spec -> 1.237 --- mozilla-firefox.spec | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index 2b6af4b..840e724 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -30,15 +30,16 @@ Source2: %{name}.sh Patch0: mozilla-install.patch Patch1: %{name}-lib_path.patch Patch2: %{name}-fonts.patch -Patch3: %{name}-agent.patch -Patch4: %{name}-myspell.patch -Patch5: %{name}-pango-cursor-position.patch -Patch6: %{name}-pango-ligatures.patch -Patch7: %{name}-pango-cursor-position-more.patch -Patch8: %{name}-pango-justified-range.patch -Patch9: %{name}-pango-printing.patch -Patch10: %{name}-pango-underline.patch -Patch11: %{name}-xft-randewidth.patch +Patch3: %{name}-myspell.patch +Patch4: %{name}-pango-cursor-position.patch +Patch5: %{name}-pango-ligatures.patch +Patch6: %{name}-pango-cursor-position-more.patch +Patch7: %{name}-pango-justified-range.patch +Patch8: %{name}-pango-printing.patch +Patch9: %{name}-pango-underline.patch +Patch10: %{name}-xft-randewidth.patch +Patch11: %{name}-ti-agent.patch +Patch12: %{name}-agent.patch # if ac rebuild is needed... #PatchX: %{name}-ac.patch URL: http://www.mozilla.org/projects/firefox/ @@ -60,6 +61,7 @@ BuildRequires: nss-devel >= 1:3.11.3-3 BuildRequires: pango-devel >= 1:1.6.0 BuildRequires: perl-modules >= 5.004 BuildRequires: pkgconfig +BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.356 BuildRequires: xorg-lib-libXext-devel BuildRequires: xorg-lib-libXft-devel >= 2.1 @@ -108,10 +110,14 @@ cd mozilla %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p0 +%patch8 -p0 +%patch9 -p1 %patch10 -p1 +%if "%{pld_release}" == "ti" %patch11 -p1 +%else +%patch12 -p1 +%endif %build cd mozilla -- 2.44.0