add --prefix and install engines to /lib

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index dcfaaf9dc536285a1b27d9a4e40d0ce7f3711f7c..619881b51877c1710471e7882d5f6bbaefffb7ef 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -50,6 +50,7 @@ Patch6:               %{name}-ldflags.patch
 Patch7:                %{name}-find.patch
 Patch8:                pic.patch
 Patch10:       %{name}_fix_for_x32.patch
+Patch11:       engines-dir.patch
 URL:           http://www.openssl.org/
 BuildRequires: bc
 BuildRequires: perl-devel >= 1:5.10.0
@@ -280,8 +281,7 @@ mv %{name}-OpenSSL_1_0_2-stable/* .
 %ifarch x32
 %patch10 -p1
 %endif
-
-sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure
+%patch11 -p1
 
 %build
 touch Makefile.*
@@ -292,6 +292,7 @@ touch Makefile.*
 OPTFLAGS="%{rpmcflags} %{rpmcppflags} %{?with_purify:-DPURIFY}" \
 PERL="%{__perl}" \
 %{__perl} ./Configure \
+       --prefix=%{_prefix} \
        --openssldir=%{_sysconfdir}/%{name} \
        --libdir=%{_lib} \
        shared \
@@ -299,7 +300,6 @@ PERL="%{__perl}" \
        %{?with_sslv2:enable-ssl2}%{!?with_sslv2:no-ssl2} \
        %{?with_sslv3:enable-ssl3}%{!?with_sslv3:no-ssl3} \
        %{!?with_zlib:no-}zlib \
-       enable-camelia \
        enable-cms \
        enable-idea \
        enable-md2 \
@@ -307,7 +307,6 @@ PERL="%{__perl}" \
        enable-rc5 \
        enable-rfc3779 \
        enable-seed \
-       enable-tlsext \
 %ifarch %{x8664}
        enable-ec_nistp_64_gcc_128 \
 %endif
@@ -351,7 +350,7 @@ PERL="%{__perl}" \
 %endif
 
 v=$(awk -F= '/^VERSION/{print $2}' Makefile)
-test "$v" = %{version}%{?with_snap:-dev}
+test "$v" = %{version}%{?subver:-%{subver}}%{?with_snap:-dev}
 
 %{__make} -j1 all rehash %{?with_tests:tests} \
        CC="%{__cc}" \