rpms/firefox/devel .cvsignore, 1.53, 1.54 firefox.spec, 1.257, 1.258 sources, 1.64, 1.65

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4689

Modified Files:
	.cvsignore firefox.spec sources 
Log Message:
* Thu Feb 21 2008 Christopher Aillon <caillon at redhat.com> 3.0-0.beta3.25
- Update to latest trunk (2008-02-21)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	21 Feb 2008 01:44:16 -0000	1.53
+++ .cvsignore	22 Feb 2008 02:30:18 -0000	1.54
@@ -1,2 +1,2 @@
 firefox-langpacks-20080104.tar.bz2
-mozilla-20080220.tar.bz2
+mozilla-20080221.tar.bz2


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- firefox.spec	21 Feb 2008 01:44:16 -0000	1.257
+++ firefox.spec	22 Feb 2008 02:30:18 -0000	1.258
@@ -7,20 +7,20 @@
 %define mozappdir 		%{_libdir}/%{name}-%{version_internal}
 
 %define gecko_version	1.9
-%define xulrunner_version 1.9-0.beta3.24
+%define xulrunner_version 1.9-0.beta3.25
 
 %define official_branding    0
 %define build_langpacks      0
 
 %if ! %{official_branding}
-%define cvsdate 20080220
+%define cvsdate 20080221
 %define nightly .nightly%{cvsdate}
 %endif
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        3.0
-Release:        0.beta3.24%{?nightly}%{?dist}
+Release:        0.beta3.25%{?nightly}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -131,11 +131,13 @@
 export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'
 
-%ifarch ppc ppc64 s390 s390x
-%define moz_make_flags -j1
-%else
-%define moz_make_flags %{?_smp_mflags}
+MOZ_SMP_FLAGS=-j1
+%ifnarch ppc ppc64 s390 s390x
+[ -z "$RPM_BUILD_NCPUS" ] && \
+     RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
+[ "$RPM_BUILD_NCPUS" -gt 1 ] && MOZ_SMP_FLAGS=-j2
 %endif
+%define moz_make_flags $MOZ_SMP_FLAGS
 
 INTERNAL_GECKO=%{version_internal}
 MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
@@ -313,8 +315,8 @@
 #---------------------------------------------------------------------
 
 %changelog
-* Wed Feb 20 2008 Christopher Aillon <caillon at redhat.com> 3.0-0.beta3.24
-- Update to latest trunk (2008-02-20)
+* Thu Feb 21 2008 Christopher Aillon <caillon at redhat.com> 3.0-0.beta3.25
+- Update to latest trunk (2008-02-21)
 
 * Sun Feb 17 2008 Christopher Aillon <caillon at redhat.com> 3.0-0.beta3.23
 - Update to latest trunk (2008-02-17)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	21 Feb 2008 01:44:16 -0000	1.64
+++ sources	22 Feb 2008 02:30:18 -0000	1.65
@@ -1,2 +1,2 @@
 d04a2981b603b9abbc8a5e0525759c4b  firefox-langpacks-20080104.tar.bz2
-16ece57828adac257433c50074fcedc1  mozilla-20080220.tar.bz2
+a8825828e9cb8d3dd5efcce54bd4abaf  mozilla-20080221.tar.bz2