--- a/ChangeLog	Wed May 14 13:50:07 2008 +0000
+++ b/ChangeLog	Wed May 14 13:58:48 2008 +0000
@@ -1,3 +1,12 @@
+2008-05-17  Michal Bielicki <[email protected]>
+
+        * SFEstdcxx.spec: update to release 4.2.1
+
+2008-05-14  Michal Bielicki <[email protected]>
+
+        * SFEunixodbc.soec: fixes for sparc
+        * SFExchat: get rid of non existant CBEbison requirement
+
 2008-05-14  Ananth Shrinivas <[email protected]>
 
 	* SFElighttpd.spec: Bump to 1.4.19, Fix %files section

--- a/SFEstdcxx.spec	Wed May 14 13:50:07 2008 +0000
+++ b/SFEstdcxx.spec	Wed May 14 13:58:48 2008 +0000
@@ -69,5 +69,8 @@
 %{_prefix}/%{gnu_prefix}/include
 
 %changelog
+* Wed May  7 2008 - [email protected]
+- upgraded to 4.2.1
+- some minor changes for SPARC compliance
 * Wed Sep  5 2007 - [email protected]
 - Initial version

--- a/SFEunixodbc.spec	Wed May 14 13:50:07 2008 +0000
+++ b/SFEunixodbc.spec	Wed May 14 13:58:48 2008 +0000
@@ -202,12 +202,28 @@
 
 %files devel
 %defattr(-, root, root)
-%{_libdir}/*.a
-%{_libdir}/*.la
+%{_libdir}/libodbcinst.la
+%{_libdir}/libodbcinst.a
+%{_libdir}/libodbc.la
+%{_libdir}/libodbc.a
+%{_libdir}/libodbccr.la
+%{_libdir}/libodbccr.a
+%{_libdir}/libgtrtst.la
+%{_libdir}/libgtrtst.a
+%{_libdir}/libboundparam.la
+%{_libdir}/libboundparam.a
 %{_includedir}/*.h
-%ifarch amd64 sarcv9
-%{_libdir}/%{_arch64}/*.a
-%{_libdir}/%{_arch64}/*.la
+%ifarch amd64 sparcv9
+%{_libdir}/%{_arch64}/libodbcinst.la
+%{_libdir}/%{_arch64}/libodbcinst.a
+%{_libdir}/%{_arch64}/libodbc.la
+%{_libdir}/%{_arch64}/libodbc.a
+%{_libdir}/%{_arch64}/libodbccr.la
+%{_libdir}/%{_arch64}/libodbccr.a
+%{_libdir}/%{_arch64}/libgtrtst.la
+%{_libdir}/%{_arch64}/libgtrtst.a
+%{_libdir}/%{_arch64}/libboundparam.la
+%{_libdir}/%{_arch64}/libboundparam.a
 %endif
 
 %if %{build_gui_qt}
@@ -291,7 +307,7 @@
 %{drvlibdir}/libsapdbS.*a
 %{drvlibdir}/libtdsS.*a
 %{drvlibdir}/libtemplate.*a
-%ifarch amd64 sparcv8
+%ifarch amd64 sparcv9
 %files drivers-devel
 %defattr(-, root, root)
 %{drvlibdir}/%{_arch64}/libesoobS.*a

--- a/SFExchat.spec	Wed May 14 13:50:07 2008 +0000
+++ b/SFExchat.spec	Wed May 14 13:58:48 2008 +0000
@@ -18,7 +18,6 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 BuildRequires: SUNWgnome-libs-devel
-BuildRequires: CBEbison
 BuildRequires: SUNWPython
 Requires: SUNWgnome-libs
 %if %{with_dbus}

--- a/base-specs/stdcxx.spec	Wed May 14 13:50:07 2008 +0000
+++ b/base-specs/stdcxx.spec	Wed May 14 13:58:48 2008 +0000
@@ -3,15 +3,14 @@
 #
 # includes module(s): stdcxx
 #
-
-%define src_ver 4.1.3
+%define src_ver 4.2.1
 %define src_name stdcxx
-%define src_url http://cvs.apache.org/dist/incubator/stdcxx/releases
+%define src_url http://www.apache.org/dist/stdcxx
 
 Name:		stdcxx
 Summary:	Apache Standard C++ Library
 Version:	%{src_ver}
-Source:		%{src_url}/%{src_name}-incubating-%{version}.tar.gz
+Source:		%{src_url}/%{src_name}-%{version}.tar.gz
 Patch1:		stdcxx-01-config.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 

--- a/base-specs/unixodbc-sr.spec	Wed May 14 13:50:07 2008 +0000
+++ b/base-specs/unixodbc-sr.spec	Wed May 14 13:58:48 2008 +0000
@@ -190,7 +190,7 @@
   --prefix=%{_prefix} \
   %{?configure_options}
 # and compile it
-make all
+gmake all
 # fix relink statement in .la files created by buggy bundled libtool
 # prepend temporary install lib path to aid in relinking
 for la in `%{__grep} '^relink_command=' */*.la | %{__cut} -d: -f1`; do

--- a/patches/stdcxx-01-config.diff	Wed May 14 13:50:07 2008 +0000
+++ b/patches/stdcxx-01-config.diff	Wed May 14 13:58:48 2008 +0000
@@ -1,6 +1,19 @@
---- stdcxx-4.1.3/etc/config/sunpro.config.orig	2007-09-05 14:02:09.168881693 +0700
-+++ stdcxx-4.1.3/etc/config/sunpro.config	2007-09-05 14:05:36.354066280 +0700
-@@ -29,7 +29,7 @@
+diff -Nru stdcxx-4.2.1/etc/config/gcc.config stdcxx-4.2.1-patched/etc/config/gcc.config
+--- stdcxx-4.2.1/etc/config/gcc.config	2008-04-24 18:25:50.000000000 -0600
++++ stdcxx-4.2.1-patched/etc/config/gcc.config	2008-05-14 04:04:50.416944000 -0600
+@@ -202,7 +202,7 @@
+ DEBUG_CXXFLAGS  = -g
+ DEBUG_CPPFLAGS  =
+ 
+-OPTMZ_CXXFLAGS  = -O2
++OPTMZ_CXXFLAGS  = -O3
+ OPTMZ_CPPFLAGS  =
+ 
+ # shared/static library options
+diff -Nru stdcxx-4.2.1/etc/config/sunpro.config stdcxx-4.2.1-patched/etc/config/sunpro.config
+--- stdcxx-4.2.1/etc/config/sunpro.config	2008-04-24 18:25:50.000000000 -0600
++++ stdcxx-4.2.1-patched/etc/config/sunpro.config	2008-05-14 04:04:50.414009000 -0600
+@@ -77,7 +77,7 @@
  DEBUG_CXXFLAGS  = -g
  DEBUG_CPPFLAGS  =
  
@@ -9,34 +22,3 @@
  OPTMZ_CPPFLAGS  =
  
  # shared/static library options
-@@ -74,7 +74,7 @@
- SINGL_LDFLAGS  =
- 
- # wide (64-bit flags)
--WIDE_CXXFLAGS  = -xarch=v9
--WIDE_LDFLAGS   = -xarch=v9
--WIDE_LDSOFLAGS = -xarch=v9
-+WIDE_CXXFLAGS  = -m64
-+WIDE_LDFLAGS   = -m64
-+WIDE_LDSOFLAGS = -m64
- WIDE_ARFLAGS   =
---- stdcxx-4.1.3/etc/config/gcc.config.orig	2007-09-05 14:09:10.683804830 +0700
-+++ stdcxx-4.1.3/etc/config/gcc.config	2007-09-05 14:08:40.565487451 +0700
-@@ -64,7 +64,7 @@
-   endif
- endif
- 
--LDSOFLAGS       = -shared
-+LDSOFLAGS       = -Wl,-G
- 
- ifneq ($(CXX_MAJOR),2)
- LDSOFLAGS      += -lsupc++
-@@ -122,7 +122,7 @@
- DEBUG_CXXFLAGS  = -g
- DEBUG_CPPFLAGS  =
- 
--OPTMZ_CXXFLAGS  = -O2
-+OPTMZ_CXXFLAGS  = -O3
- OPTMZ_CPPFLAGS  =
- 
- # shared/static library options