- separated engines subpackage; makes it possible to install openssl 1.0.0

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index 152900944bfc52decc4d51c3654616722843fb05..769154fbcd9c5a5fb113e6cade9d935a50cfd805 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -17,7 +17,7 @@ Summary(ru.UTF-8):    Библиотеки и утилиты для соедине
 Summary(uk.UTF-8):     Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:          openssl
 Version:       1.0.0
-Release:       2
+Release:       7
 License:       Apache-like
 Group:         Libraries
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
@@ -98,6 +98,28 @@ RC4, RSA и SSL.
 користування, що реалізують велику кількість криптографічних
 алгоритмів, включаючи DES, RC4, RSA та SSL.
 
+%package engines
+Summary:       OpenSSL optional crypto engines
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description engines
+With OpenSSL 0.9.6, a new component was added to support alternative
+cryptography implementations, most commonly for interfacing with external
+crypto devices (eg. accelerator cards). This component is called ENGINE.
+
+There are currently built-in ENGINE implementations for the following
+crypto devices:
+
+- CryptoSwift
+- Compaq Atalla
+- nCipher CHIL
+- Nuron
+- Broadcom uBSec
+
+In addition, dynamic binding to external ENGINE implementations is now
+provided by a special ENGINE called "dynamic". 
+
 %package tools
 Summary:       OpenSSL command line tool and utilities
 Summary(pl.UTF-8):     Zestaw narzędzi i skryptów
@@ -265,7 +287,7 @@ OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}" \
 
 %{__make} -j1 all rehash %{?with_tests:tests} \
        CC="%{__cc}" \
-       ASFLAG='$(CFLAG) -c -Wa,--noexecstack' \
+       ASFLAG='$(CFLAG) -Wa,--noexecstack' \
        INSTALLTOP=%{_prefix}
 
 # Rename POD sources of man pages. "openssl_" prefix is added to each
@@ -319,23 +341,16 @@ cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/openssl.1
 install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ssl-certificate
 install -p %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/c_rehash.sh
 
-for mtype in man1 man3 man5 man7; do
-       for man in $RPM_BUILD_ROOT%{_mandir}/${mtype}/*.[0-9]; do
-               b=$(readlink "$man" || :)
-               [ -z "$b" ] && continue
-               # delete manual pages pointing to nowhere
-               [ ! -f "$RPM_BUILD_ROOT%{_mandir}/${mtype}/$b" ] && rm "$man"
-               # delete manual pages pointing to openssl_ prefixed man page
-               echo "$b" | grep -q "^openssl_" && rm "$man"
-       done
-done
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+%triggerpostun -- %{name}-tools < 1.0.0-5
+# the hashing format has changed in 1.0.0
+[ ! -x %{_sbindir}/update-ca-certificates ] || %{_sbindir}/update-ca-certificates --fresh || :
+
 %if "%{pld_release}" == "ti"
 %triggerin -- %{name}-tools < 0.9.8i-2
 if [ -L /var/lib/openssl/openssl.cnf ] ; then
@@ -364,8 +379,6 @@ fi
 %doc doc/openssl_button.gif doc/openssl_button.html
 %attr(755,root,root) /%{_lib}/libcrypto.so.*.*.*
 %attr(755,root,root) /%{_lib}/libssl.so.*.*.*
-%dir /%{_lib}/engines
-%attr(755,root,root) /%{_lib}/engines/*.so
 %if "%{pld_release}" == "ti"
 %dir %{_var}/lib/%{name}
 %dir %{_var}/lib/%{name}/certs
@@ -380,6 +393,10 @@ fi
 %endif
 %dir %{_datadir}/ssl
 
+%files engines
+%dir /%{_lib}/engines
+%attr(755,root,root) /%{_lib}/engines/*.so
+
 %files tools
 %defattr(644,root,root,755)
 %if "%{pld_release}" == "ti"
@@ -414,7 +431,6 @@ fi
 %{_mandir}/man1/openssl_ec.1*
 %{_mandir}/man1/openssl_ecparam.1*
 %{_mandir}/man1/openssl_enc.1*
-%{_mandir}/man1/openssl_*pkey*.1*
 %{_mandir}/man1/openssl_errstr.1*
 %{_mandir}/man1/openssl_gendsa.1*
 %{_mandir}/man1/openssl_genpkey.1*