- fix build on 64bit archs, pkgconfig fixes in patch

Changed files:
    openssl.spec -> 1.153

diff --git a/openssl.spec b/openssl.spec
index fc80ec39801f417e1e87fa30a42849ddb613ff33..c93e2436e513e15344d49009bb87b1931b424ba5 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -26,6 +26,7 @@ Patch1:               %{name}-optflags.patch
 Patch2:                %{name}-globalCA.diff
 Patch3:                %{name}-include.patch
 Patch4:                %{name}-md5-sparcv9.patch
+Patch5:                %{name}-libvar.patch
 URL:           http://www.openssl.org/
 BuildRequires: perl-devel >= 1:5.6.1
 BuildRequires: rpm-perlprov >= 4.1-13
@@ -188,6 +189,7 @@ RC4, RSA 
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
@@ -201,6 +203,7 @@ OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}"
 export OPTFLAGS
 ./Configure \
        --openssldir=%{_var}/lib/%{name} \
+       --lib=%{_lib} \
        shared threads \
        enable-mdc2 enable-rc5 \
 %ifarch %{ix86}
@@ -309,12 +312,6 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_libdir}/%{name}} \
        INSTALL_PREFIX=$RPM_BUILD_ROOT \
        MANDIR=%{_mandir}
 
-if [ "%{_prefix}/lib/pkgconfig" != "%{_pkgconfigdir}" ] ; then
-       mv $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/* \
-               $RPM_BUILD_ROOT%{_pkgconfigdir}
-fi
-sed -i -e 's,^libdir=.*,libdir=%{_libdir},' $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
-
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/ssl/ca-bundle.crt
 install libcrypto.a libssl.a $RPM_BUILD_ROOT%{_libdir}
 install lib*.so.*.* $RPM_BUILD_ROOT%{_libdir}