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

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index da4d3f6a4c3ccf31ab609a885b3bedcf87527a8f..c93e2436e513e15344d49009bb87b1931b424ba5 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_with purify     # Compile openssl with \-DPURIFY, useful when one wants to
+                       # use valgrind debugger against openssl-linked programs
 %include       /usr/lib/rpm/macros.perl
 Summary:       OpenSSL Toolkit libraries for the "Secure Sockets Layer" (SSL v2/v3)
 Summary(de):   Secure Sockets Layer (SSL)-Kommunikationslibrary
@@ -8,12 +12,12 @@ Summary(pt_BR):      Uma biblioteca C que fornece v
 Summary(ru):   âÉÂÌÉÏÔÅËÉ É ÕÔÉÌÉÔÙ ÄÌÑ ÓÏÅÄÉÎÅÎÉÊ ÞÅÒÅÚ Secure Sockets Layer
 Summary(uk):   â¦Â̦ÏÔÅËÉ ÔÁ ÕÔÉ̦ÔÉ ÄÌÑ Ú'¤ÄÎÁÎØ ÞÅÒÅÚ Secure Sockets Layer
 Name:          openssl
-Version:       0.9.8a
-Release:       2
+Version:       0.9.8b
+Release:       1
 License:       Apache-style License
 Group:         Libraries
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 1d16c727c10185e4d694f87f5e424ee1
+# Source0-md5: 12cedbeb6813a0d7919dbf1f82134b86
 Source1:       %{name}-ca-bundle.crt
 Source2:       %{name}.1.pl
 Source3:       %{name}-ssl-certificate.sh
@@ -22,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
@@ -184,6 +189,7 @@ RC4, RSA 
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
@@ -193,10 +199,11 @@ touch Makefile.*
 
 %{__perl} util/perlpath.pl %{__perl}
 
-OPTFLAGS="%{rpmcflags}"
+OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}"
 export OPTFLAGS
 ./Configure \
        --openssldir=%{_var}/lib/%{name} \
+       --lib=%{_lib} \
        shared threads \
        enable-mdc2 enable-rc5 \
 %ifarch %{ix86}
@@ -305,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}