rpms/spicebird/F-10 spicebird.spec,1.1,1.2

[Steven M. Parrish]

Author: tuxbrewr

Update of /cvs/pkgs/rpms/spicebird/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30780

Modified Files:
	spicebird.spec 
Log Message:
Updated SPEC file to address https://bugzilla.redhat.com/show_bug.cgi?id=453936#c16


Index: spicebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spicebird/F-10/spicebird.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spicebird.spec	28 Dec 2008 19:38:23 -0000	1.1
+++ spicebird.spec	29 Dec 2008 15:48:19 -0000	1.2
@@ -10,12 +10,12 @@
 Summary:        Synovel Spicebird PIM client
 Name:           spicebird
 Version:        0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.spicebird.org/
 License:        GPLv2+
 Group:          Applications/Internet
 %define tarball spicebird-beta-%{version}.full_source.tar.bz2
-Source0:        http://tuxbrewr.fedorapeople.org/spicebird/%{tarball}
+Source0:        http://files.spicebird.org/pub/spicebird.org/spicebird/releases/latest/source/%{tarball}
 Source1:        http://tuxbrewr.fedorapeople.org/spicebird/spicebird-beta-langpacks-%{version}-20081121.tar.bz2
 Source10:       spicebird-mozconfig
 Source12:       spicebird-redhat-default-prefs.js
@@ -82,21 +82,35 @@
 
 # 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_
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//')
+#MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//')
 
-export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
+# Mozilla builds with -Wall with exception of a few warnings show up
+# everywhere in the code; so, don't override that.
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//')
+export CFLAGS=$MOZ_OPT_FLAGS
+export CXXFLAGS=$MOZ_OPT_FLAGS
+
+#export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
 export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'
 
-%ifarch ppc ppc64 s390 s390x
-%define moz_make_flags -j1
-%else
-%define moz_make_flags %{?_smp_mflags}
+#%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=-j$RPM_BUILD_NCPUS
 %endif
 
 export LDFLAGS="-Wl,-rpath,%{mozappdir}"
-export MAKE="gmake %{moz_make_flags}"
-make -f client.mk build
+#export MAKE="gmake %{moz_make_flags}"
+#make -f client.mk build
+
+make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
 
 #===============================================================================
 
@@ -251,6 +265,9 @@
 #===============================================================================
 
 %changelog
+* Mon Dec 29 2008 Steven M. Parrish <tuxbrewr at fedoraproject.org> 0.7-2
+- Updated SPEC file to address https://bugzilla.redhat.com/show_bug.cgi?id=453936#c16
+
 * Wed Dec 24 2008 Sunil Mohan Adapa <sunil at synovel.com> 0.7-1
 - Initial verison based on Thundebird RPM work