--- a/ChangeLog	Mon May 05 22:21:22 2008 +0000
+++ b/ChangeLog	Tue May 06 00:02:22 2008 +0000
@@ -1,3 +1,8 @@
+2008-05-05  Brian Cameron  <[email protected]>
+
+	* SUNWogg-vorbis.spec, base-specs/libogg.spec,
+	  base-specs/libvorbis.spec:  Now build 64 bit libraries.
+
 2008-05-05  Stephen Browne  <[email protected]>
 
 	* patches/tsoljds-tstripe-01-pw-fns.diff: removed

--- a/SUNWogg-vorbis.spec	Mon May 05 22:21:22 2008 +0000
+++ b/SUNWogg-vorbis.spec	Tue May 06 00:02:22 2008 +0000
@@ -10,6 +10,13 @@
 # Owner: yippi
 #
 %include Solaris.inc
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use libogg64 = libogg.spec
+%use libvorbis64 = libvorbis.spec
+%endif
+
+%include base.inc
 %use libogg = libogg.spec
 %use libvorbis = libvorbis.spec
 
@@ -35,32 +42,53 @@
 %prep
 rm -rf %name-%version
 mkdir %name-%version
-%libogg.prep -d %name-%version
-%libvorbis.prep -d %name-%version
+
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%libogg64.prep -d %name-%version/%_arch64
+%libvorbis64.prep -d %name-%version/%_arch64
+%endif
+
+mkdir %name-%version/%{base_arch}
+%libogg.prep -d %name-%version/%{base_arch}
+%libvorbis.prep -d %name-%version/%{base_arch}
+
 cd %{_builddir}/%name-%version
 gzcat %SOURCE0 | tar xf -
 
 %build
+export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
 
-export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
-export PKG_CONFIG_PATH=%{_builddir}/%name-%version/libogg-%{libogg.version}:%{_pkg_config_path}
-export RPM_OPT_FLAGS="$CFLAGS"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
-export LDFLAGS="%_ldflags"
+%ifarch amd64 sparcv9
+%libogg64.build -d %name-%version/%_arch64
+export PKG_CONFIG_PATH=%{_builddir}/%name-%version/%{_arch64}/libogg-%{libogg.version}:%{_pkg_config_path}
+%libvorbis64.build -d %name-%version/%_arch64
+unset PKG_CONFIG_PATH
+%endif
 
-%libogg.build -d %name-%version
-%libvorbis.build -d %name-%version
+%libogg.build -d %name-%version/%{base_arch}
+export PKG_CONFIG_PATH=%{_builddir}/%name-%version/%{base_arch}/libogg-%{libogg.version}:%{_pkg_config_path}
+%libvorbis.build -d %name-%version/%{base_arch}
 
 %install
-%libogg.install -d %name-%version
-%libvorbis.install -d %name-%version
+rm -rf $RPM_BUILD_ROOT
+
+%ifarch amd64 sparcv9
+%libogg64.install -d %name-%version/%_arch64
+%libvorbis64.install -d %name-%version/%_arch64
+%endif
+
+%libogg.install -d %name-%version/%{base_arch}
+%libvorbis.install -d %name-%version/%{base_arch}
 
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*a
+%ifarch amd64 sparcv9
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/lib*a
+%endif
 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
@@ -71,10 +99,19 @@
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/lib*.so*
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%{_libdir}/%{_arch64}/lib*.so*
+%endif
 
 %files devel
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig
+%{_libdir}/%{_arch64}/pkgconfig/*
+%endif
 %dir %attr (0755, root, other) %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/*
 %dir %attr (0755, root, bin) %{_includedir}
@@ -88,6 +125,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon May 05 2008 - [email protected]
+- Port amd64 building from SFEogg-vorbis.spec
 * Wed Apr 02 2008 - [email protected]
 - Add SUNW_Copyright.
 * Mon Sep 04 2006 - [email protected]

--- a/base-specs/libogg.spec	Mon May 05 22:21:22 2008 +0000
+++ b/base-specs/libogg.spec	Tue May 06 00:02:22 2008 +0000
@@ -50,10 +50,18 @@
 %setup
 
 %build
-%{?suse_update_config:%{suse_update_config -f}}
+
+export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+export LDFLAGS="%_ldflags"
+
 autoreconf --force --install
-CFLAGS="$RPM_OPT_FLAGS" \
-./configure --prefix=%{_prefix} --libdir=%{_libdir}
+./configure --prefix=%{_prefix}		\
+	    --libdir=%{_libdir}		\
+	    --includedir=%{_includedir}	\
+	    --datadir=%{_datadir}	\
+	    --enable-shared		\
+	    --disable-static
 make
 
 %install
@@ -82,6 +90,8 @@
 %{_datadir}/gtk-doc
 
 %changelog -n libogg
+* Mon May 05 2008 - [email protected]
+- Now support building 64-bit libraries.
 * Tue Dec 27 2005 - [email protected]
 - Bump to 1.1.3.
 * Mon Jun 06 2005 - [email protected]

--- a/base-specs/libvorbis.spec	Mon May 05 22:21:22 2008 +0000
+++ b/base-specs/libvorbis.spec	Tue May 06 00:02:22 2008 +0000
@@ -52,13 +52,22 @@
 %setup
 
 %build
-%{?suse_update_config:%{suse_update_config -f}}
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
+export LDFLAGS="%_ldflags"
+
 aclocal $ACLOCAL_FLAGS
 autoconf
 automake -a -f
 #autoreconf --force --install
-CFLAGS="$RPM_OPT_FLAGS" \
-./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ogg-libraries=%{_libdir}
+./configure --prefix=%{_prefix}			\
+	    --libdir=%{_libdir}			\
+	    --datadir=%{_datadir}		\
+	    --mandir=%{_mandir}			\
+	    --with-ogg-libraries=%{_libdir}	\
+	    --enable-shared			\
+	    --disable-static
+
 make
 
 %install
@@ -87,6 +96,8 @@
 %{_datadir}/gtk-doc
 
 %changelog -n libvorbis
+* Mon May 05 2008 - [email protected]
+- Now support building 64-bit libraries.
 * Mon Jul 30 2007 - [email protected]
 - Bump to 1.2.0.
 * Tue Dec 27 2005 - [email protected]