SPECS: mozilla-firefox.spec - merged Titanium user agent patch from FF 2.x

hawk hawk at pld-linux.org
Wed Jun 18 13:40:49 CEST 2008


Author: hawk                         Date: Wed Jun 18 11:40:49 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged Titanium user agent patch from FF 2.x

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.241 -> 1.242) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.241 SPECS/mozilla-firefox.spec:1.242
--- SPECS/mozilla-firefox.spec:1.241	Tue Jun 17 20:00:03 2008
+++ SPECS/mozilla-firefox.spec	Wed Jun 18 13:40:43 2008
@@ -30,9 +30,10 @@
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
 Patch0:		%{name}-install.patch
-Patch1:		%{name}-agent.patch
-Patch2:		%{name}-agent-ac.patch
-Patch3:		%{name}-gcc3.patch
+Patch1:		%{name}-gcc3.patch
+Patch2:		%{name}-agent.patch
+Patch3:		%{name}-agent-ac.patch
+Patch4:		%{name}-agent-ti.patch
 URL:		http://www.mozilla.org/projects/firefox/
 %{?with_gnomevfs:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	automake
@@ -107,13 +108,21 @@
 %setup -qc -n %{name}-%{version}
 cd mozilla
 %patch0 -p1
-%if "%{pld_release}" == "ac"
+
+%if "%{cc_version}" < "3.4"
+%patch1 -p2
+%endif
+
+%if "%{pld_release}" == "th"
 %patch2 -p1
-%else
-%patch1 -p1
 %endif
-%if "%{cc_version}" < "3.4"
-%patch3 -p2
+
+%if "%{pld_release}" == "ac"
+%patch3 -p1
+%endif
+
+%if "%{pld_release}" == "ti"
+%patch4 -p1
 %endif
 
 %build
@@ -422,6 +431,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.242  2008/06/18 11:40:43  hawk
+- merged Titanium user agent patch from FF 2.x
+
 Revision 1.241  2008/06/17 18:00:03  glen
 - drop crashreporter todo, simplify
 
================================================================

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



More information about the pld-cvs-commit mailing list