--- a/SUNWflac.spec	Fri Mar 16 12:58:21 2007 +0000
+++ b/SUNWflac.spec	Fri Mar 16 22:57:47 2007 +0000
@@ -10,6 +10,20 @@
 # Owner: yippi
 #
 %include Solaris.inc
+%ifarch amd64 sparcv9
+%include arch64.inc
+%define sse_opt --enable-sse
+%use flac_64 = flac.spec
+%endif
+
+%if %arch_sse2
+%include x86_sse2.inc
+%define sse_opt --enable-sse
+%use flac_sse2 = flac.spec
+%endif
+
+%include base.inc
+%define sse_opt --disable-sse
 %use flac = flac.spec
 
 Name:        SUNWflac
@@ -17,9 +31,8 @@
 Version:     %{flac.version}
 SUNW_BaseDir:%{_basedir}
 BuildRoot:   %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
 BuildConflicts: SFEnasm
-
-%include default-depend.inc
 BuildRequires: SUNWgnome-common-devel
 BuildRequires: SUNWogg-vorbis-devel
 Requires: SUNWogg-vorbis
@@ -33,26 +46,73 @@
 %prep
 rm -rf %name-%version
 mkdir %name-%version
-%flac.prep -d %name-%version
+
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%flac_64.prep -d %name-%version/%_arch64
+%endif
+
+%if %arch_sse2
+mkdir %name-%version/%sse2_arch
+%flac_sse2.prep -d %name-%version/%sse2_arch
+%endif
+
+mkdir %name-%version/%base_arch
+%flac.prep -d %name-%version/%base_arch
 
 %build
-export LDFLAGS="-z ignore"
-export CFLAGS="%optflags"
-export CXXFLAGS="%cxx_optflags"
-%flac.build -d %name-%version
-                                                                                
+%ifarch amd64 sparcv9
+%flac_64.build -d %name-%version/%_arch64
+%endif
+
+%if %arch_sse2
+%flac_sse2.build -d %name-%version/%sse2_arch
+%endif
+
+%flac.build -d %name-%version/%base_arch
+
 %install
-%flac.install -d %name-%version
+rm -rf $RPM_BUILD_ROOT
+
+%ifarch amd64 sparcv9
+%flac_64.install -d %name-%version/%_arch64
+%endif
+
+%if %arch_sse2
+%flac_sse2.install -d %name-%version/%sse2_arch
+%endif
+
+%flac.install -d %name-%version/%base_arch
+
+%if %can_isaexec
+mkdir $RPM_BUILD_ROOT%{_bindir}/%{base_isa}
+mv $RPM_BUILD_ROOT%{_bindir}/flac $RPM_BUILD_ROOT%{_bindir}/%{base_isa}
+mv $RPM_BUILD_ROOT%{_bindir}/metaflac $RPM_BUILD_ROOT%{_bindir}/%{base_isa}
+%endif
 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-                                                                                
+
+%if %can_isaexec
+%post
+ln ${BASEDIR}/lib/isaexec ${BASEDIR}/bin/flac
+ln ${BASEDIR}/lib/isaexec ${BASEDIR}/bin/metaflac
+installf $PKGINST %{_bindir}/flac || exit 2
+installf $PKGINST %{_bindir}/metaflac || exit 2
+installf -f $PKGINST || exit 2
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
+%if %can_isaexec
+%{_bindir}/%{base_isa}
+%else
+%{_bindir}/flac
+%{_bindir}/metaflac
+%endif
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/libFLAC.so*
 %{_libdir}/libFLAC++.so*
@@ -60,6 +120,18 @@
 %dir %attr(0755, root, bin) %{_mandir}
 %dir %attr(0755, root, bin) %{_mandir}/man1
 %{_mandir}/man1/*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_bindir}/%{_arch64}
+%{_bindir}/%{_arch64}/*
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%{_libdir}/%{_arch64}/lib*.so*
+%endif
+%if %arch_sse2
+%dir %attr (0755, root, bin) %{_bindir}/%{sse2_arch}
+%{_bindir}/%{sse2_arch}/*
+%dir %attr (0755, root, bin) %{_libdir}/%{sse2_arch}
+%{_libdir}/%{sse2_arch}/lib*.so*
+%endif
  
 %files devel
 %defattr (-, root, bin)
@@ -72,8 +144,18 @@
 %{_datadir}/aclocal/*
 %dir %attr (0755, root, other) %{_datadir}/doc
 %{_datadir}/doc/*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig
+%{_libdir}/%{_arch64}/pkgconfig/*.pc
+%endif
+%if %arch_sse2
+%dir %attr (0755, root, other) %{_libdir}/%{sse2_arch}/pkgconfig
+%{_libdir}/%{sse2_arch}/pkgconfig/*.pc
+%endif
 
 %changelog
+* Thu Mar 15 2007 - [email protected] and [email protected]
+- enable building 64-bit and SSE2 variants
 * Fri Feb 16 2007 - [email protected]
 - Add %{_libdir}/pkgconfig to %files devel.
 * Wed Feb 14 2007 - [email protected]