From d3d7dacdf7176deacfd385d725ee852f2cc472a14d9b1bbfba548483949eb768 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 9 Jan 2014 16:25:37 +0000
Subject: [PATCH] Accepting request 213132 from Base:System

Fixed bnc#857850, openssl doesn't load engine; Modify file: openssl.spec (forwarded request 213131 from shawn2012)

OBS-URL: https://build.opensuse.org/request/show/213132
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=106
---
 openssl.changes | 6 ++++++
 openssl.spec    | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/openssl.changes b/openssl.changes
index aa85401..9b5154b 100644
--- a/openssl.changes
+++ b/openssl.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan  8 10:57:24 UTC 2014 - shchang@suse.com
+
+- Fixed bnc#857850, openssl doesn't load engine
+  Modify file: openssl.spec
+
 -------------------------------------------------------------------
 Thu Jan  2 17:28:41 UTC 2014 - shchang@suse.com
 
diff --git a/openssl.spec b/openssl.spec
index 8d9ce1d..d45719b 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -396,7 +396,7 @@ $RPM_BUILD_ROOT/usr/bin/fips_standalone_hmac \
 mkdir $RPM_BUILD_ROOT/%{_lib}
 #mv $RPM_BUILD_ROOT%{_libdir}/libssl.so.%{num_version} $RPM_BUILD_ROOT/%{_lib}/
 #mv $RPM_BUILD_ROOT%{_libdir}/libcrypto.so.%{num_version} $RPM_BUILD_ROOT/%{_lib}/
-#mv $RPM_BUILD_ROOT%{_libdir}/engines $RPM_BUILD_ROOT/%{_lib}/
+mv $RPM_BUILD_ROOT%{_libdir}/engines $RPM_BUILD_ROOT/%{_lib}/
 cd $RPM_BUILD_ROOT%{_libdir}/
 ln -sf /%{_libdir}/libssl.so.%{num_version} ./libssl.so
 #ln -sf /%{_lib}/libssl.so.%{num_version} ./libssl.so.%{num_version}
@@ -404,11 +404,11 @@ ln -sf /%{_libdir}/libcrypto.so.%{num_version} ./libcrypto.so
 #ln -sf /%{_lib}/libcrypto.so.%{num_version} ./libcrypto.so.%{num_version}
 
 for engine in 4758cca atalla nuron sureware ubsec cswift chil aep; do
-rm %{buildroot}/%{_libdir}/engines/lib$engine.so
+rm %{buildroot}/%{_lib}/engines/lib$engine.so
 done
 
 %ifnarch %{ix86} x86_64
-rm %{buildroot}/%{_libdir}/engines/libpadlock.so
+rm %{buildroot}/%{_lib}/engines/libpadlock.so
 %endif
 
 %clean
@@ -422,7 +422,7 @@ if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi
 %defattr(-, root, root)
 /%{_libdir}/libssl.so.%{num_version}
 /%{_libdir}/libcrypto.so.%{num_version}
-/%{_libdir}/engines
+/%{_lib}/engines
 
 %files -n libopenssl1_0_0-hmac
 %defattr(-, root, root)