rpms/openssl/devel openssl.spec, 1.104, 1.105 opensslconf-new.h, 1.1, 1.2

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13362/devel

Modified Files:
	openssl.spec opensslconf-new.h 
Log Message:
sparc handling


Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- openssl.spec	10 Mar 2008 10:45:36 -0000	1.104
+++ openssl.spec	20 May 2008 15:16:15 -0000	1.105
@@ -14,7 +14,7 @@
 
 # Arches on which we need to prevent arch conflicts on opensslconf.h, must
 # also be handled in opensslconf-new.h.
-%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
+%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 sparc64 x86_64
 
 # Arches for which we don't build subpackages.
 %define optimize_arches i686
@@ -22,7 +22,7 @@
 Summary: The OpenSSL toolkit
 Name: openssl
 Version: 0.9.8g
-Release: 6%{?dist}
+Release: 7%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -142,10 +142,14 @@
 	sslflags="no-asm 386"
 fi
 %endif
-%ifarch sparc
+%ifarch sparcv9
 sslarch=linux-sparcv9
 sslflags=no-asm
 %endif
+%ifarch sparc64
+sslarch=linux64-sparcv9
+sslflags=no-asm
+%endif
 %ifarch alpha alphaev56 alphaev6 alphaev67
 sslarch=linux-alpha-gcc
 %endif
@@ -286,6 +290,12 @@
 %ifarch %{ix86}
 basearch=i386
 %endif
+%ifarch sparcv9
+basearch=sparc
+%endif
+%ifarch sparc64
+basearch=sparc64
+%endif
 
 %ifarch %{multilib_arches}
 # Do an opensslconf.h switcheroo to avoid file conflicts on systems where you
@@ -369,6 +379,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon May 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.8g-7
+- sparc handling
+
 * Mon Mar 10 2008 Joe Orton <jorton at redhat.com> 0.9.8g-6
 - update to new root CA bundle from mozilla.org (r1.45)
 


Index: opensslconf-new.h
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/opensslconf-new.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- opensslconf-new.h	9 Sep 2004 09:49:16 -0000	1.1
+++ opensslconf-new.h	20 May 2008 15:16:15 -0000	1.2
@@ -21,6 +21,10 @@
 #include "opensslconf-s390x.h"
 #elif defined(__s390__)
 #include "opensslconf-s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "opensslconf-sparc64.h"
+#elif defined(__sparc__)
+#include "opensslconf-sparc.h"
 #elif defined(__x86_64__)
 #include "opensslconf-x86_64.h"
 #else