- updated to 0.9.8m

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index 0ad390743e73d526646d331e4269eef0029c73db..8edb5573b9c319c4d4ff894c4a7dadd57fb00710 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -14,12 +14,12 @@ Summary(pt_BR.UTF-8):       Uma biblioteca C que fornece vários algoritmos e protocol
 Summary(ru.UTF-8):     Библиотеки и утилиты для соединений через Secure Sockets Layer
 Summary(uk.UTF-8):     Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:          openssl
-Version:       0.9.8k
+Version:       0.9.8m
 Release:       1
 License:       Apache-like
 Group:         Libraries
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: e555c6d58d276aec7fdc53363e338ab3
+# Source0-md5: 898bf125370926d5f692a2201124f8ec
 Source2:       %{name}.1.pl
 Source3:       %{name}-ssl-certificate.sh
 Source4:       %{name}-c_rehash.sh
@@ -27,11 +27,11 @@ Patch0:             %{name}-alpha-ccc.patch
 Patch1:                %{name}-optflags.patch
 Patch2:                %{name}-globalCA.diff
 Patch3:                %{name}-include.patch
-Patch4:                %{name}-libvar.patch
-Patch5:                %{name}-man-namespace.patch
-Patch6:                %{name}-asflag.patch
-Patch7:                %{name}-ca-certificates.patch
-Patch8:                %{name}-fips_install.patch
+Patch4:                %{name}-man-namespace.patch
+Patch5:                %{name}-asflag.patch
+Patch6:                %{name}-ca-certificates.patch
+Patch7:                %{name}-fips_install.patch
+Patch8:                %{name}-ldflags.patch
 URL:           http://www.openssl.org/
 BuildRequires: bc
 BuildRequires: perl-devel >= 1:5.6.1
@@ -200,12 +200,12 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p0
+%patch8 -p1
 
 %{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
        `grep -l -r "%{_prefix}/local/bin/perl" *`
 
-sed -i -e 's|$prefix/lib/engines|%{_libdir}/engines|g' Configure
+sed -i -e 's|$prefix/lib/engines|/%{_lib}/engines|g' Configure
 
 %build
 touch Makefile.*
@@ -219,9 +219,15 @@ OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}" \
 %else
        --openssldir=%{_sysconfdir}/%{name} \
 %endif
-       --lib=%{_lib} \
+       --libdir=%{_lib} \
        shared threads \
-       enable-mdc2 enable-rc5 \
+       enable-tlsext \
+       enable-seed \
+       enable-rfc3779 \
+       enable-cms \
+       enable-idea \
+       enable-mdc2 \
+       enable-rc5 \
 %ifarch %{ix86}
 %ifarch i386
        386 linux-elf
@@ -277,6 +283,7 @@ done
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}} \
        $RPM_BUILD_ROOT{%{_mandir}/{pl/man1,man{1,3,5,7}},%{_datadir}/ssl} \
+       $RPM_BUILD_ROOT/%{_lib}/engines \
        $RPM_BUILD_ROOT%{_pkgconfigdir}
 
 %{__make} install \
@@ -284,10 +291,10 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}} \
        INSTALL_PREFIX=$RPM_BUILD_ROOT \
        MANDIR=%{_mandir}
 
-install libcrypto.a libssl.a $RPM_BUILD_ROOT%{_libdir}
-install lib*.so.*.* $RPM_BUILD_ROOT%{_libdir}
-ln -sf libcrypto.so.*.* $RPM_BUILD_ROOT%{_libdir}/libcrypto.so
-ln -sf libssl.so.*.* $RPM_BUILD_ROOT%{_libdir}/libssl.so
+mv -f $RPM_BUILD_ROOT/%{_libdir}/engines/* $RPM_BUILD_ROOT/%{_lib}/engines
+mv -f $RPM_BUILD_ROOT/%{_libdir}/lib*.so.*.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcrypto.*.*) $RPM_BUILD_ROOT%{_libdir}/libcrypto.so
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libssl.*.*) $RPM_BUILD_ROOT%{_libdir}/libssl.so
 
 %if "%{pld_release}" == "ti"
 ln -sf %{_var}/lib/%{name}/%{name}.cnf \
@@ -342,10 +349,10 @@ fi
 %defattr(644,root,root,755)
 %doc CHANGES CHANGES.SSLeay LICENSE NEWS README doc/*.txt
 %doc doc/openssl_button.gif doc/openssl_button.html
-%attr(755,root,root) %{_libdir}/libcrypto.so.*.*.*
-%attr(755,root,root) %{_libdir}/libssl.so.*.*.*
-%dir %{_libdir}/engines
-%attr(755,root,root) %{_libdir}/engines/*.so
+%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