--- a/SUNWsigcpp.spec	Mon Jun 01 07:59:50 2009 +0000
+++ b/SUNWsigcpp.spec	Mon Jun 01 08:23:25 2009 +0000
@@ -11,6 +11,13 @@
 #
 
 %include Solaris.inc
+
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use sigcpp_64 = sigcpp.spec
+%endif
+
+%include base.inc
 %use sigcpp = sigcpp.spec
 
 Name:                    SUNWsigcpp
@@ -33,26 +40,49 @@
 %prep
 rm -rf %name-%version
 mkdir %name-%version
-%sigcpp.prep -d %name-%version
+
+%ifarch amd64 sparcv9
+mkdir %name-%version/%{_arch64}
+%sigcpp_64.prep -d %name-%version/%{_arch64}
+%endif
+
+mkdir %name-%version/%{base_arch}
+%sigcpp.prep -d %name-%version/%{base_arch}
 cd %{_builddir}/%name-%version
 gzcat %SOURCE0 | tar xf -
 
 %build
-%if %cc_is_gcc
-export CXXFLAGS="%{gcc_cxx_optflags}"
-%else
+
+%ifarch amd64 sparcv9
+export CFLAGS="%optflags64"
+export CXX="${CXX} -norunpath -features=tmplife"
+export CXXFLAGS="%cxx_optflags64"
+export LDFLAGS="$FLAG64"
+%sigcpp_64.build -d %name-%version/%{_arch64}
+%endif
+
 export CFLAGS="%optflags"
-export CXX="${CXX} -norunpath"
+export CXX="${CXX} -norunpath -features=tmplife"
 export CXXFLAGS="%cxx_optflags"
-%endif
 export LDFLAGS="%_ldflags"
-%sigcpp.build -d %name-%version
+%sigcpp.build -d %name-%version/%{base_arch}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%sigcpp.install -d %name-%version
+
+%sigcpp.install -d %name-%version/%{base_arch}
+mkdir $RPM_BUILD_ROOT%{_datadir}/doc/libsigc-2.0/examples
+cp %{_builddir}/%name-%version/%{base_arch}/libsigc*/tests/.libs/test* $RPM_BUILD_ROOT%{_datadir}/doc/libsigc-2.0/examples/
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
 
+%ifarch amd64 sparcv9
+%sigcpp_64.install -d %name-%version/%{_arch64}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/libsigc-2.0/examples/%{_arch64}
+cp %{_builddir}/%name-%version/%{_arch64}/libsigc*/tests/.libs/test* $RPM_BUILD_ROOT%{_datadir}/doc/libsigc-2.0/examples/%{_arch64}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/lib*a
+%endif
+
+
 # install man page
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 cd %{_builddir}/%name-%version/sun-manpages
@@ -65,10 +95,14 @@
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/lib*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%{_libdir}/%{_arch64}/lib*
+%endif
 %dir %attr (0755, root, sys) %{_datadir}
-%doc -d libsigc++-%{sigcpp.version} AUTHORS README
-%doc(bzip2) -d libsigc++-%{sigcpp.version} COPYING NEWS
-%doc(bzip2) -d libsigc++-%{sigcpp.version} ChangeLog
+%doc -d %{base_arch}/libsigc++-%{sigcpp.version} AUTHORS README
+%doc(bzip2) -d %{base_arch}/libsigc++-%{sigcpp.version} COPYING NEWS
+%doc(bzip2) -d %{base_arch}/libsigc++-%{sigcpp.version} ChangeLog
 %dir %attr (0755, root, other) %{_datadir}/doc
 
 %files devel
@@ -77,6 +111,12 @@
 %dir %attr (0755, root, other) %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/*
 %{_libdir}/sigc++*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig
+%{_libdir}/%{_arch64}/pkgconfig/*
+%{_libdir}/%{_arch64}/sigc++*
+%endif
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/doc
 %{_datadir}/doc/libsigc*