From 164cb5959e03be2a34a57aebbd8bb49904935f7b Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Sat, 15 Mar 2008 18:01:26 +0000 Subject: [PATCH] - Avoid conflicts between gecko debuginfo packages --- firefox.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/firefox.spec b/firefox.spec index 1032c30..09c4b3f 100644 --- a/firefox.spec +++ b/firefox.spec @@ -19,7 +19,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 3.0 -Release: 0.40%{?nightly}%{?dist} +Release: 0.41%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -87,7 +87,8 @@ compliance, performance and portability. #--------------------------------------------------------------------- %prep -%setup -q -n mozilla +%setup -q -c +cd mozilla %patch43 -p1 -b .getstartpage @@ -121,6 +122,7 @@ echo "ac_add_options --with-libxul-sdk=\ #--------------------------------------------------------------------- %build +cd mozilla # Build with -Os as it helps the browser; also, don't override mozilla's warning # level; they use -Wall but disable a few warnings that show up _everywhere_ @@ -149,6 +151,7 @@ make -f client.mk build STRIP="/bin/true" %install %{__rm} -rf $RPM_BUILD_ROOT +cd mozilla DESTDIR=$RPM_BUILD_ROOT make install @@ -314,6 +317,9 @@ fi #--------------------------------------------------------------------- %changelog +* Sat Mar 15 2008 Christopher Aillon 3.0-0.41 +- Avoid conflicts between gecko debuginfo packages + * Wed Mar 12 2008 Christopher Aillon 3.0-0.40 - Update to latest trunk (2008-03-12)