--- a/ChangeLog	Mon May 03 08:59:30 2010 +0000
+++ b/ChangeLog	Mon May 03 21:42:17 2010 +0000
@@ -1,3 +1,15 @@
+2010-05-03  Brian Cameron  <[email protected]>
+
+	* base-specs/numpy.spec: Bump to 1.4.1.
+	* base-specs/iso-codes.spec: Bump to 3.16.
+	* base-specs/totem.spec: Bump to 2.30.1.
+	* base-specs/gnome-system-monitor.spec, base-specs/thunderbird.spec:
+	  Correct spelling of "Bump".
+	* specs/SUNgnome-media.spec:,base-specs/gst-plugins-base.spec,
+	  base-specs/gst-plugins-good.spec: Fix so that CFLAGS, CXXFLAGS, etc.
+	  get set in the toplevel spec-file.  Also fix so that the taglib
+	  plugin will build if it is installed.
+
 2010-04-30  Brian Cameron  <[email protected]>
 
 	* base-specs/gst.spec, base-specs/gst-plugins-base.spec:  Bump to

--- a/base-specs/gnome-system-monitor.spec	Mon May 03 08:59:30 2010 +0000
+++ b/base-specs/gnome-system-monitor.spec	Mon May 03 21:42:17 2010 +0000
@@ -136,7 +136,7 @@
 
 %changelog
 * Sat Apr  3 2010 - [email protected]
-- Bumpt to 2.28.1.
+- Bump to 2.28.1.
 * Wed Sep 23 2009 - [email protected]
 - Bump to 2.28.0
 * Thu Aug 27 2009 - [email protected]

--- a/base-specs/gst-plugins-base.spec	Mon May 03 08:59:30 2010 +0000
+++ b/base-specs/gst-plugins-base.spec	Mon May 03 21:42:17 2010 +0000
@@ -80,9 +80,6 @@
 
 %build
 
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
 glib-gettextize -f
 libtoolize --copy --force
 intltoolize --copy --force --automake

--- a/base-specs/gst-plugins-good.spec	Mon May 03 08:59:30 2010 +0000
+++ b/base-specs/gst-plugins-good.spec	Mon May 03 21:42:17 2010 +0000
@@ -120,11 +120,6 @@
 %patch10 -p1
 
 %build
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-# Turn off optimization as ss12 cores. Bugster: 6706089
-#CFLAGS=$(echo $CFLAGS | sed -e 's/-xO4//'); \
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
 glib-gettextize -f
 libtoolize --copy --force
 intltoolize --copy --force --automake

--- a/base-specs/iso-codes.spec	Mon May 03 08:59:30 2010 +0000
+++ b/base-specs/iso-codes.spec	Mon May 03 21:42:17 2010 +0000
@@ -13,7 +13,7 @@
 Name:         iso-codes
 License:      LGPLv2.1
 Group:        System/Base
-Version:      3.15
+Version:      3.16
 Release:      1
 BuildArch:    noarch
 Distribution: Java Desktop System
@@ -53,6 +53,8 @@
 %{_datadir}/*
 
 %changelog
+* Mon May 03 2010 - [email protected]
+- Bump to 3.16.
 * Tue Apr 20 2010 - [email protected]
 - Bump to 3.15.
 * Thu Jan 28 2010 - [email protected]

--- a/base-specs/numpy.spec	Mon May 03 08:59:30 2010 +0000
+++ b/base-specs/numpy.spec	Mon May 03 21:42:17 2010 +0000
@@ -17,7 +17,7 @@
 Name:         numpy
 License:      BSD
 Group:        Development/Languages/Python
-Version:      1.4.0
+Version:      1.4.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:       SciPy
@@ -55,6 +55,8 @@
 %{_libdir}/python?.?/vendor-packages
 
 %changelog
+* Mon May 03 2010 - [email protected]
+- Bump to 1.4.1.
 * Thu Jan 28 2010 - [email protected]
 - Bump to 1.4.0.
 * Mon Nov 02 2009 - [email protected]

--- a/base-specs/thunderbird.spec	Mon May 03 08:59:30 2010 +0000
+++ b/base-specs/thunderbird.spec	Mon May 03 21:42:17 2010 +0000
@@ -273,7 +273,7 @@
 
 %changelog
 * Sat Apr 17 2010 - [email protected]
-- Bumpt to 3.0.4
+- Bump to 3.0.4
 * Wed Mar 10 2010 - [email protected]
 - Add $ORIGIN to --with-rpath
 * Tue Mar 09 2010 - [email protected]

--- a/base-specs/totem.spec	Mon May 03 08:59:30 2010 +0000
+++ b/base-specs/totem.spec	Mon May 03 21:42:17 2010 +0000
@@ -1,7 +1,7 @@
 #
 # spec file for package totem
 #
-# Copyright (c) 2009 Sun Microsystems, Inc.
+# Copyright (c) 2010 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -14,7 +14,7 @@
 Name:         totem
 License:      GPL v2, LGPL v2, BSD
 Group:        System/GUI/GNOME
-Version:      2.30.0
+Version:      2.30.1
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Gnome Community
@@ -161,6 +161,8 @@
 %{_includedir}/totem/*
 
 %changelog
+* Mon May 03 2010 - [email protected]
+- Bump to 2.30.1.
 * Mon Apr 12 2010 - [email protected]
 - Bump to 2.30.0.
 * Fri Mar 19 2010 - [email protected]

--- a/specs/SUNWgnome-media.spec	Mon May 03 08:59:30 2010 +0000
+++ b/specs/SUNWgnome-media.spec	Mon May 03 21:42:17 2010 +0000
@@ -135,7 +135,15 @@
 
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 
+# The taglib gst-plugins-good plugin does not build without setting this since
+# AC_PROG_PATH does not work with CXX set to the full-path of the C++ compiler.
+# So, overriding the setting fixes this.
+#
+export HAVE_CXX=yes
+
 %ifarch amd64 sparcv9
+export CXXFLAGS="%cxx_optflags64"
+
 export CFLAGS="%optflags64 -I/usr/sfw/include -DANSICPP"
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="$FLAG64"
@@ -162,15 +170,18 @@
 export PKG_CONFIG_PATH="%{_builddir}/%name-%version/%{_arch64}/gstreamer-%{gst.version}/pkgconfig:%{_builddir}/%name-%version/%{_arch64}/gst-plugins-base-%{gst_plugins_base.version}/pkgconfig:%{_pkg_config_path64}"
 
 # Need to disable building with these libraries since there is no 64-bit
-# version available yet.
+# version available yet.  We do not ship taglib, but the spec-file in SFE
+# does not build 64-bit yet.
 #
-export GST_EXTRA_CONFIG="--disable-soup"
+export GST_EXTRA_CONFIG="--disable-soup --disable-taglib"
 
 %gst_plugins_good64.build -d %name-%version/%_arch64
 
 export GST_EXTRA_CONFIG=""
 %endif
 
+export CXXFLAGS="%cxx_optflags"
+
 export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="%_ldflags"