From: Richard Levitte Date: Wed, 11 Apr 2001 10:06:44 +0000 (+0000) Subject: NetBSD and OpenBSD use TOD as well X-Git-Tag: OpenSSL_0_9_6b~47 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ec11fa2159d6f93db9c520b4e0ebfd0e4a2421bf;p=oweals%2Fopenssl.git NetBSD and OpenBSD use TOD as well --- diff --git a/apps/speed.c b/apps/speed.c index 067903099d..29004700fc 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -82,12 +82,12 @@ #include #include -#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 d7be413937..09a8a0a151 100644 --- 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