rpms/mingw-openssl
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Move self test to %check, like the native openssl package now does

Browse Source
This commit is contained in:
Kalev Lember 2012-03-07 00:47:59 +02:00
parent b02efcd918
commit cbfc82b0b4
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mingw-openssl.spec
View File

@ -174,7 +174,7 @@ Static version of the MinGW port of the OpenSSL toolkit.
%patch25 -p1 -b .manfix %patch25 -p1 -b .manfix
%patch32 -p1 -b .ia64 %patch32 -p1 -b .ia64
#patch33 is applied after make test %patch33 -p1 -b .ca-dir
%patch34 -p1 -b .x509 %patch34 -p1 -b .x509
%patch35 -p1 -b .version-add-engines %patch35 -p1 -b .version-add-engines
%patch38 -p1 -b .cipher-change %patch38 -p1 -b .cipher-change
@ -235,10 +235,19 @@ make all build-shared
# Generate hashes for the included certs. # Generate hashes for the included certs.
make rehash build-shared make rehash build-shared
if ! iconv -f UTF-8 -t ASCII//TRANSLIT CHANGES >/dev/null 2>&1 ; then
iconv -f ISO-8859-1 -t UTF-8 -o CHANGES.utf8 CHANGES && \
mv -f CHANGES.utf8 CHANGES
fi
%if %{run_tests} %if %{run_tests}
%check
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Run some tests. I don't know why this isn't in a %-check section # Run some tests.
# but this is how it is in the native RPM.
# We must revert patch33 before tests otherwise they will fail
patch -p1 -R < %{PATCH33}
# This is a bit of a hack, but the test scripts look for 'openssl' # This is a bit of a hack, but the test scripts look for 'openssl'
# by name. # by name.
@ -286,9 +295,6 @@ make LDCMD=%{mingw32_cc} -C test apps tests
#---------------------------------------------------------------------- #----------------------------------------------------------------------
%endif %endif
# Patch33 must be patched after tests otherwise they will fail
patch -p1 -b -z .ca-dir < %{PATCH33}
# Add generation of HMAC checksum of the final stripped library # Add generation of HMAC checksum of the final stripped library
##define __spec_install_post \ ##define __spec_install_post \
# #{?__debug_package:#{__debug_install_post}} \ # #{?__debug_package:#{__debug_install_post}} \
@ -298,11 +304,6 @@ patch -p1 -b -z .ca-dir < %{PATCH33}
# ln -sf .libcrypto.so.#{version}.hmac $RPM_BUILD_ROOT/#{_lib}/.libcrypto.so.#{soversion}.hmac \ # ln -sf .libcrypto.so.#{version}.hmac $RPM_BUILD_ROOT/#{_lib}/.libcrypto.so.#{soversion}.hmac \
##{nil} ##{nil}
if ! iconv -f UTF-8 -t ASCII//TRANSLIT CHANGES >/dev/null 2>&1 ; then
iconv -f ISO-8859-1 -t UTF-8 -o CHANGES.utf8 CHANGES && \
mv -f CHANGES.utf8 CHANGES
fi
%install %install
mkdir -p $RPM_BUILD_ROOT%{mingw32_libdir} mkdir -p $RPM_BUILD_ROOT%{mingw32_libdir}