rpms/xulrunner/devel .cvsignore, 1.23, 1.24 sources, 1.24, 1.25 xulrunner.spec, 1.73, 1.74

[Christopher Aillon (caillon)]

Author: caillon

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

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	21 Feb 2008 01:37:34 -0000	1.23
+++ .cvsignore	22 Feb 2008 02:30:06 -0000	1.24
@@ -1 +1 @@
-mozilla-20080220.tar.bz2
+mozilla-20080221.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	21 Feb 2008 01:37:34 -0000	1.24
+++ sources	22 Feb 2008 02:30:06 -0000	1.25
@@ -1 +1 @@
-16ece57828adac257433c50074fcedc1  mozilla-20080220.tar.bz2
+a8825828e9cb8d3dd5efcce54bd4abaf  mozilla-20080221.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xulrunner.spec	21 Feb 2008 01:37:34 -0000	1.73
+++ xulrunner.spec	22 Feb 2008 02:30:06 -0000	1.74
@@ -7,14 +7,14 @@
 %define version_internal  1.9pre
 
 %if ! %{official_branding}
-%define cvsdate 20080220
+%define cvsdate 20080221
 %define nightly .nightly%{cvsdate}
 %endif
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.beta3.24%{?nightly}%{?dist}
+Release:        0.beta3.25%{?nightly}%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -159,11 +159,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
 
 export LDFLAGS="-Wl,-rpath,${MOZ_APP_DIR}"
 export MAKE="gmake %{moz_make_flags}"
@@ -397,6 +399,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Feb 21 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.beta3.25
+- Update to latest trunk (2008-02-21)
+
 * Wed Feb 20 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.beta3.24
 - Update to latest trunk (2008-02-20)