SPECS (DEVEL): mozilla-firefox.spec - prepare for AC build

[glen]

Author: glen                         Date: Tue May 27 05:27:22 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- prepare for AC build

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.228.4.27 -> 1.228.4.28) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.228.4.27 SPECS/mozilla-firefox.spec:1.228.4.28
--- SPECS/mozilla-firefox.spec:1.228.4.27	Fri May 23 14:36:28 2008
+++ SPECS/mozilla-firefox.spec	Tue May 27 07:27:17 2008
@@ -32,11 +32,12 @@
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}%{subver}/source/firefox-%{version}%{subver}-source.tar.bz2
 # Source0-md5:	0a918cb4686aff937c052d1a72297092
-#Source0:	firefox-%{version}%{subver}-20080310-source.tar.bz2
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
 Patch0:		%{name}-install.patch
 Patch1:		%{name}-agent.patch
+Patch2:		%{name}-agent-ac.patch
+Patch3:		%{name}-gcc3.patch
 URL:		http://www.mozilla.org/projects/firefox/
 %{?with_gnomevfs:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	automake
@@ -59,7 +60,8 @@
 BuildRequires:	pango-devel >= 1:1.6.0
 BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.356
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRequires:	startup-notification-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel >= 2.1
@@ -88,7 +90,7 @@
 # and as we don't provide them, don't require either
 %define		_noautoreq		libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so
 
-%if "%(rpm -q --qf %{V} gcc)" >= "3.4"
+%if "%{cc_version}" >= "3.4"
 %define		specflags	-fno-strict-aliasing -fno-tree-vrp -fno-stack-protector
 %else
 %define		specflags	-fno-strict-aliasing
@@ -107,7 +109,14 @@
 %setup -qc -n %{name}-%{version}%{?subver}
 cd mozilla
 %patch0 -p1
+%if "%{pld_release}" == "ac"
+%patch2 -p1
+%else
 %patch1 -p1
+%endif
+%if "%{cc_version}" < "3.4"
+%patch3 -p2
+%endif
 
 %build
 cd mozilla
@@ -422,6 +431,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.228.4.28  2008-05-27 05:27:17  glen
+- prepare for AC build
+
 Revision 1.228.4.27  2008-05-23 12:36:28  cactus
 - we want some crashraporter files as bcond describes
 - Throbber-small.gif added
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mozilla-firefox.spec?r1=1.228.4.27&r2=1.228.4.28&f=u