NetBSD and OpenBSD use TOD as well

diff --git a/apps/speed.c b/apps/speed.c
index 067903099d93cfa189270954e3ec368af0c6c45f..29004700fc1f6eb01feb9a9e13c8803f416ae14b 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -82,12 +82,12 @@
 #include <openssl/rand.h>
 #include <openssl/err.h>
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 # define USE_TOD
 #elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
 # define TIMES
 #endif
-#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE)
+#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) && !defined(__NetBSD__)
 # define TIMEB
 #endif
 

diff --git a/openssl.spec b/openssl.spec
index d7be41393784b351d4e41ef0f6c99f946f17f3d8..09a8a0a151c3c965354e82ae67a46203a598ad02 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -2,6 +2,9 @@
 %define libmin 9
 %define librel 6
 %define librev a
+%define libstatus beta3_dev
+%define fileversion %{libmaj}.%{libmin}.%{librel}%{librev}-beta3-dev
+%define rpmversion %{libmaj}.%{libmin}.%{librel}%{librev}_%{libstatus}
 Release: 1
 
 %define openssldir /var/ssl
@@ -9,8 +12,8 @@ Release: 1
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
 #Version: %{libmaj}.%{libmin}.%{librel}
-Version: %{libmaj}.%{libmin}.%{librel}%{librev}
-Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
+Version: %{rpmversion}
+Source0: ftp://ftp.openssl.org/source/%{name}-%{fileversion}.tar.gz
 Copyright: Freely distributable
 Group: System Environment/Libraries
 Provides: SSL
@@ -79,7 +82,7 @@ documentation and POD files from which the man pages were produced.
 
 %prep
 
-%setup -q
+%setup -n %{name}-%{fileversion}
 
 %build 
 
@@ -96,9 +99,7 @@ perl util/perlpath.pl /usr/bin/perl
 %ifarch alpha
 ./Configure %{CONFIG_FLAGS} --openssldir=%{openssldir} linux-alpha shared
 %endif
-LD_LIBRARY_PATH=`pwd` make
-LD_LIBRARY_PATH=`pwd` make rehash
-LD_LIBRARY_PATH=`pwd` make test
+LD_LIBRARY_PATH=`pwd` ( make && make rehash && make test )
 
 %install
 rm -rf $RPM_BUILD_ROOT