SPECS: openssl.spec - fix build on 64bit archs, pkgconfig fixes in...

[sparky]

Author: sparky                       Date: Fri Jul 14 20:03:26 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix build on 64bit archs, pkgconfig fixes in patch

---- Files affected:
SPECS:
   openssl.spec (1.152 -> 1.153) 

---- Diffs:

================================================================
Index: SPECS/openssl.spec
diff -u SPECS/openssl.spec:1.152 SPECS/openssl.spec:1.153
--- SPECS/openssl.spec:1.152	Tue Jun 13 12:13:03 2006
+++ SPECS/openssl.spec	Fri Jul 14 22:03:21 2006
@@ -27,6 +27,7 @@
 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
@@ -189,6 +190,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__perl} -pi -e 's#%{_prefix}/local/bin/perl#%{__perl}#g' \
@@ -202,6 +204,7 @@
 export OPTFLAGS
 ./Configure \
 	--openssldir=%{_var}/lib/%{name} \
+	--lib=%{_lib} \
 	shared threads \
 	enable-mdc2 enable-rc5 \
 %ifarch %{ix86}
@@ -310,12 +313,6 @@
 	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}
@@ -443,6 +440,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.153  2006/07/14 20:03:21  sparky
+- fix build on 64bit archs, pkgconfig fixes in patch
+
 Revision 1.152  2006/06/13 10:13:03  qboosh
 - spelling
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openssl.spec?r1=1.152&r2=1.153&f=u