--- a/ChangeLog	Tue Mar 27 16:43:59 2007 +0000
+++ b/ChangeLog	Wed Mar 28 02:52:43 2007 +0000
@@ -1,3 +1,12 @@
+2007-03-27  Laszlo (Laca) Peter  <[email protected]>
+
+	* SUNWgnutls.spec: enable 64-bit build
+	* SUNWlibgcrypt.spec: enable 64-bit build
+	* SUNWlibgpg-error.spec: enable 64-bit build
+	* base-specs/gnutls.spec: clean up
+	* base-specs/libgcrypt.spec: clean up and enable parallel build
+	* base-specs/libgpg-error.spec: clean up and enable parallel build
+
 2007-03-27  Damien Carbery <[email protected]>
 
 	* closed/SUNWfsexam.spec:  Add Build/Requires SUNWautoef for auto_ef.h

--- a/SUNWgnutls.spec	Tue Mar 27 16:43:59 2007 +0000
+++ b/SUNWgnutls.spec	Wed Mar 28 02:52:43 2007 +0000
@@ -10,6 +10,12 @@
 # Owner: jefftsai
 #
 %include Solaris.inc
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use gnutls64 = gnutls.spec
+%endif
+
+%include base.inc
 %use gnutls = gnutls.spec
 
 Name:          SUNWgnutls
@@ -32,16 +38,29 @@
 %prep
 rm -rf %name-%version
 mkdir -p %name-%version
-%gnutls.prep -d %name-%version
+%ifarch amd64 sparcv9
+mkdir -p %name-%version/%_arch64
+%gnutls64.prep -d %name-%version/%_arch64
+%endif
+
+mkdir -p %name-%version/%base_arch
+%gnutls.prep -d %name-%version/%base_arch
 
 %build
-export LDFLAGS="%_ldflags -L%{_libdir} -R%{_libdir} -lsocket -lnsl"
-export CFLAGS="%optflags"
-export MSGFMT="/usr/bin/msgfmt"
-%gnutls.build -d %name-%version
+%ifarch amd64 sparcv9
+%gnutls64.build -d %name-%version/%_arch64
+%endif
+
+%gnutls.build -d %name-%version/%base_arch
 
 %install
-%gnutls.install -d %name-%version
+rm -rf $RPM_BUILD_ROOT
+%ifarch amd64 sparcv9
+%gnutls64.install -d %name-%version/%_arch64
+rm -rf $RPM_BUILD_ROOT%{_bindir}/%{_arch64}/psktool
+%endif
+
+%gnutls.install -d %name-%version/%base_arch
 rm -rf $RPM_BUILD_ROOT%{_datadir}/man
 rm -rf $RPM_BUILD_ROOT%{_datadir}/info
 rm -rf $RPM_BUILD_ROOT%{_bindir}/psktool
@@ -55,31 +74,48 @@
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/gnutls*
 %{_bindir}/certtool
 %{_bindir}/srptool
+%ifarch amd64 sparcv9
+%{_bindir}/%{_arch64}/gnutls*
+%{_bindir}/%{_arch64}/certtool
+%{_bindir}/%{_arch64}/srptool
+%endif
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/lib*.so*
+%ifarch amd64 sparcv9
+%{_libdir}/%{_arch64}/lib*.so*
+%endif
 
 %files devel
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/libgnutls-config
 %{_bindir}/libgnutls-extra-config
+%ifarch sparcv9 amd64
+%{_bindir}/%{_arch64}/libgnutls-config
+%{_bindir}/%{_arch64}/libgnutls-extra-config
+%endif
 %dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/*
 %dir %attr (0755, root, bin) %{_libdir}
 %dir %attr (0755, root, other) %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/*
+%ifarch sparcv9 amd64
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig
+%{_libdir}/%{_arch64}/pkgconfig/*
+%endif
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/aclocal
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Mar 27 2007 - [email protected]
+- enable 64-bit build
 * Mon Feb  5 2007 - [email protected]
 - Add Requires SUNWlibC after check-deps.pl run.
 * Tue Jan 16 2007 - [email protected]

--- a/SUNWlibgcrypt.spec	Tue Mar 27 16:43:59 2007 +0000
+++ b/SUNWlibgcrypt.spec	Wed Mar 28 02:52:43 2007 +0000
@@ -10,7 +10,13 @@
 # Owner: jefftsai
 #
 %include Solaris.inc
-%define run_ldconfig /bin/true
+
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use libgcrypt64 = libgcrypt.spec
+%endif
+
+%include base.inc
 %use libgcrypt = libgcrypt.spec
 
 Name:          SUNWlibgcrypt
@@ -31,16 +37,29 @@
 %prep
 rm -rf %name-%version
 mkdir -p %name-%version
-%libgcrypt.prep -d %name-%version
+%ifarch amd64 sparcv9
+mkdir -p %name-%version/%_arch64
+%libgcrypt64.prep -d %name-%version/%_arch64
+%endif
+
+mkdir -p %name-%version/%base_arch
+%libgcrypt.prep -d %name-%version/%base_arch
 
 %build
-export CFLAGS="%optflags"
-export MSGFMT="/usr/bin/msgfmt"
-export LDFLAGS="%_ldflags"
-%libgcrypt.build -d %name-%version
+%ifarch amd64 sparcv9
+%libgcrypt64.build -d %name-%version/%_arch64
+%endif
+
+%libgcrypt.build -d %name-%version/%base_arch
 
 %install
-%libgcrypt.install -d %name-%version
+rm -rf $RPM_BUILD_ROOT
+%ifarch amd64 sparcv9
+%libgcrypt64.install -d %name-%version/%_arch64
+#rm -rf $RPM_BUILD_ROOT%{_bindir}/%_arch64
+%endif
+
+%libgcrypt.install -d %name-%version/%base_arch
 rm -rf $RPM_BUILD_ROOT%{_datadir}/info
 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
@@ -52,7 +71,9 @@
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/lib*.so*
-
+%ifarch amd64 sparcv9
+%{_libdir}/%{_arch64}
+%endif
 
 %files devel
 %defattr (-, root, bin)
@@ -65,6 +86,8 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Mar 27 2007 - [email protected]
+- enable 64-bit build
 * Thu May 04 2006 - [email protected]
 - merge -share pkg(s) into the base pkg(s)
 * Thu Apr 06 2006 - [email protected]

--- a/SUNWlibgpg-error.spec	Tue Mar 27 16:43:59 2007 +0000
+++ b/SUNWlibgpg-error.spec	Wed Mar 28 02:52:43 2007 +0000
@@ -10,6 +10,12 @@
 # Owner: jefftsai
 #
 %include Solaris.inc
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use libgpgerror64 = libgpg-error.spec
+%endif
+
+%include base.inc
 %use libgpgerror = libgpg-error.spec
 
 Name:          SUNWlibgpg-error
@@ -28,16 +34,30 @@
 %prep
 rm -rf %name-%version
 mkdir -p %name-%version
-%libgpgerror.prep -d %name-%version
+%ifarch amd64 sparcv9
+mkdir -p %name-%version/%_arch64
+%libgpgerror64.prep -d %name-%version/%_arch64
+%endif
+
+mkdir -p %name-%version/%base_arch
+%libgpgerror.prep -d %name-%version/%base_arch
 
 %build
-export CFLAGS="%optflags"
-export MSGFMT="/usr/bin/msgfmt"
-export LDFLAGS="%_ldflags"
-%libgpgerror.build -d %name-%version
+%ifarch amd64 sparcv9
+%libgpgerror64.build -d %name-%version/%_arch64
+%endif
+
+%libgpgerror.build -d %name-%version/%base_arch
 
 %install
-%libgpgerror.install -d %name-%version
+rm -rf $RPM_BUILD_ROOT
+%ifarch amd64 sparcv9
+%libgpgerror64.install -d %name-%version/%_arch64
+#remove this file because SUNWgnome-base-libs deliver same file
+rm -f $RPM_BUILD_ROOT%{_libdir}/%_arch64/charset.alias
+%endif
+
+%libgpgerror.install -d %name-%version/%base_arch
 
 #remove this file because SUNWgnome-base-libs deliver same file
 rm -f $RPM_BUILD_ROOT%{_libdir}/charset.alias
@@ -51,6 +71,9 @@
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/lib*.so*
+%ifarch amd64 sparcv9
+%{_libdir}/%{_arch64}/lib*.so*
+%endif
 
 %files devel
 %defattr (-, root, bin)
@@ -64,29 +87,23 @@
 %{_datadir}/common-lisp
 
 %changelog
+* Tue Mar 27 2007 - [email protected]
+- enable 64-bit build
 * Mon Jul 19 2007 - [email protected]
 - Remove l10n package and update %files after libgpg-error bumped to 1.5.
-
 * Sat Jul 22 2006 - [email protected]
 - Add l10n package.
-
 * Thu May 11 2006 - [email protected]
 - Change %defattr to (-, root, other).
-
 * Thu May 04 2006 - [email protected]
 - merge -share pkg(s) into the base pkg(s)
-
 * Thu Apr 06 2006 - [email protected]
 - Move -config file to -devel.
-
 * Tue Apr 04 2006 - [email protected]
 - Alter remove .a/.la files part into linux spec. 
-
 * Thu Mar 30 2006 - [email protected]
 - Remove all *.a/*.la files.
-
 * Fri Sep 09 2005 - <[email protected]>
 - remove unpackaged files
-
 * Wed Aug 31 2005 - [email protected]
 - initial version created

--- a/base-specs/gnutls.spec	Tue Mar 27 16:43:59 2007 +0000
+++ b/base-specs/gnutls.spec	Wed Mar 28 02:52:43 2007 +0000
@@ -35,15 +35,6 @@
     library implements the proposed standards by the IETF's TLS working
     group (RFC2246, TLS 1.0).
 
-%files
-%defattr(-, root, root)
-%doc COPYING ChangeLog AUTHORS INSTALL NEWS README
-%{_libdir}/lib*.so.*
-
-
-%post
-ldconfig
-
 %package -n gnutls-devel
 Summary:	The GnuTLS implements the proposed standards by the IETF's TLS working group (RFC2246, TLS 1.0).
 Group:		Development/Libraries
@@ -57,28 +48,8 @@
     library implements the proposed standards by the IETF's TLS working
     group (RFC2246, TLS 1.0).
 
-%files -n gnutls-devel
-%defattr(-, root, root)
-%{_libdir}/lib*.so
-%{_includedir}/*
-
-
-# $RPM_COMMAND is an environment variable used by the SUN build
-# system to control the build process with finer granularity than RPM
-# normally allows.  This specfile will function as expected by RPM if
-# $RPM_COMMAND is unset.  If you are not the SUN build system,
-# feel free to ignore it.
-
 %prep
-case "${RPM_COMMAND:-all}" in
-dist)
-%setup  -q -D -n %{name}-%{version}
-    ;;
-all)
 %setup  -q -n %{name}-%{version}
-    ;;
-esac
-
 bash -x %SOURCE1
 
 %build
@@ -93,54 +64,45 @@
   CPUS=1
 fi
 
-MAKE=${MAKE:-make}
-RPM_COMMAND=${RPM_COMMAND:-all}
-DESTDIR=${DESTDIR:-"$RPM_BUILD_ROOT"}
-ARCH=%{_target_platform}
-export MAKE RPM_COMMAND DESTDIR ARCH
-case "$RPM_COMMAND" in
-prepare|all)
-    ./configure --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --infodir=%{_datadir}/info --localstatedir=/var --with-included-libtasn1
-    ;;
-esac
-case "$RPM_COMMAND" in
-clean|all)
-    if [ "/" != "$DESTDIR" ]; then
-	rm -rf "$DESTDIR"
-    fi
-    ;;
-esac
-case "$RPM_COMMAND" in
-build|all)
-    ${MAKE} -j $CPUS
-    ;;
-esac
+export CFLAGS="%optflags"
+export CXXFLAGS="%cxx_optflags"
+export LDFLAGS="%_ldflags"
+./configure \
+    --prefix=%{_prefix} \
+    --libdir=%{_libdir} \
+    --bindir=%{_bindir} \
+    --sysconfdir=%{_sysconfdir} \
+    --mandir=%{_mandir} \
+    --infodir=%{_datadir}/info \
+    --localstatedir=%{_localstatedir} \
+    --with-included-libtasn1
+
+make -j $CPUS
 
 %install
-MAKE=${MAKE:-make}
-DESTDIR=${DESTDIR:-"$RPM_BUILD_ROOT"}
-# export DESTDIR
-case "${RPM_COMMAND:-all}" in
-install|all)
-    ${MAKE} install prefix=${DESTDIR}%{_prefix} sysconfdir=${DESTDIR}%{_sysconfdir} mandir=${DESTDIR}%{_mandir} infodir=${DESTDIR}%{_datadir}/info localstatedir=${DESTDIR}/var
-    ;;
-esac
+make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
 %clean
-DESTDIR=${DESTDIR:-"$RPM_BUILD_ROOT"}
-export DESTDIR
-case "${RPM_COMMAND:-all}" in
-clean|all)
-    if [ "/" != "$DESTDIR" ]; then
-	rm -rf "$DESTDIR"
-    fi
-    ;;
-esac
+rm -rf $RPM_BUILD_ROOT
+
+%post
+ldconfig
 
+%files
+%defattr(-, root, root)
+%doc COPYING ChangeLog AUTHORS INSTALL NEWS README
+%{_libdir}/lib*.so.*
+
+%files -n gnutls-devel
+%defattr(-, root, root)
+%{_libdir}/lib*.so
+%{_includedir}/*
 
 %changelog
+* Tue Mar 27 2007 - [email protected]
+- clean up
 * Tue Jan 16 2007 - [email protected]
 - Bump to 1.6.1.
 * Thu Apr 20 2006 - [email protected]

--- a/base-specs/libgcrypt.spec	Tue Mar 27 16:43:59 2007 +0000
+++ b/base-specs/libgcrypt.spec	Wed Mar 28 02:52:43 2007 +0000
@@ -2,15 +2,13 @@
 # spec file for package libgcrypt (Version 1.2.1)
 #
 # Copyright (c) 2003 SuSE Linux AG, Nuernberg, Germany.
+# Copyright 2007 Sun Microsystems, Inc
+#
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
-#
 # Owner: jefftsai
 #
-# neededforbuild  libpth
-# usedforbuild    aaa_base acl attr bash bind9-utils bison cpio cpp cyrus-sasl db devs diffutils e2fsprogs file filesystem fileutils fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip kbd less libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg pam pam-devel pam-modules patch permissions ps rcs readline sed sendmail sh-utils shadow strace syslogd sysvinit tar texinfo textutils timezone unitedlinux-release unzip util-linux vim zlib-devel autoconf automake binutils bzip2 cracklib gcc gdbm gettext libpth libtool perl rpm zlib
 
 Name:         libgcrypt
 Version:      1.2.4
@@ -28,40 +26,41 @@
 Libgcrypt is a general purpose crypto library based on the code used in
 GnuPG (alpha version)
 
-Authors:
---------
-    Maintainer:	[email protected]
-    
-    Authors: 	Werner Koch <[email protected]>
-    		Matthew Skala <[email protected]>
-    		Michael Roth <[email protected]>
-    		Niklas Hernaeus <[email protected]>
-    		R�mi Guyomarch <[email protected]>
-    		Timo Schulz <[email protected]>
-
 %prep
 %setup -n %{name}-%{version}
-
 bash -x %SOURCE1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure \
-		--prefix=%{_prefix} \
-		--sysconfdir=/etc \
-		--libdir=%{_libdir} \
-		--infodir=%{_infodir} \
-		--enable-maintainer-mode  --disable-asm
-make 
+%ifos linux
+if [ -x /usr/bin/getconf ]; then
+  CPUS=`getconf _NPROCESSORS_ONLN`
+fi
+%else
+  CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+%endif
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+  CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+./configure \
+    --prefix=%{_prefix} \
+    --libdir=%{_libdir} \
+    --bindir=%{_bindir} \
+    --sysconfdir=/etc \
+    --libdir=%{_libdir} \
+    --infodir=%{_infodir} \
+    --enable-maintainer-mode \
+    --disable-asm
+
+make -j$CPUS
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
-%post
-%run_ldconfig
-
 %files
 %defattr(-,root,root)
 %doc AUTHORS BUGS COPYING COPYING.DOC COPYING.LIB ChangeLog INSTALL NEWS README README-alpha THANKS TODO VERSION
@@ -72,6 +71,8 @@
 /usr/share/aclocal/*
 
 %changelog -n libgcrypt
+* Tue Mar 27 2007 - [email protected]
+- clean up, enable parallel build
 * Fri Mar 16 2007 - [email protected]
 - Bump to 1.2.4.
 * Wed Oct 25 2006 - [email protected]

--- a/base-specs/libgpg-error.spec	Tue Mar 27 16:43:59 2007 +0000
+++ b/base-specs/libgpg-error.spec	Wed Mar 28 02:52:43 2007 +0000
@@ -27,15 +27,30 @@
 bash -x %SOURCE1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure \
-		--prefix=%{_prefix} \
-		--sysconfdir=/etc \
-		--libdir=%{_libdir} \
-		--infodir=%{_infodir} 
-make 
+%ifos linux
+if [ -x /usr/bin/getconf ]; then
+  CPUS=`getconf _NPROCESSORS_ONLN`
+fi
+%else
+  CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+%endif
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+  CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+./configure \
+    --prefix=%{_prefix} \
+    --bindir=%{_bindir} \
+    --libdir=%{_libdir} \
+    --sysconfdir=/etc \
+    --libdir=%{_libdir} \
+    --infodir=%{_infodir} 
+
+make -j$CPUS
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
@@ -61,6 +76,8 @@
 %{_datadir}/aclocal/gpg-error.m4
 
 %changelog -n libgpg-error
+* Tue Mar 27 2007 - [email protected]
+- clean up, enable parallel build
 * Fri Mar 16 2007 - [email protected]
 - Bump to 1.5.
 * Sat Jul 22 2006 - [email protected]