SPECS: openssl.spec - rel 3; more gcc 4.2 hacks until issue proper...

[arekm]

Author: arekm                        Date: Sat Feb 24 23:34:27 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3; more gcc 4.2 hacks until issue properly resolved

---- Files affected:
SPECS:
   openssl.spec (1.169 -> 1.170) 

---- Diffs:

================================================================
Index: SPECS/openssl.spec
diff -u SPECS/openssl.spec:1.169 SPECS/openssl.spec:1.170
--- SPECS/openssl.spec:1.169	Sat Feb 24 21:58:55 2007
+++ SPECS/openssl.spec	Sun Feb 25 00:34:21 2007
@@ -1,5 +1,7 @@
 # $Revision$, $Date$
-#
+# TODO:
+# - get rid of gcc_4_2 patch and header files crapolla
+
 # Conditional build:
 %bcond_without	tests
 %bcond_with purify	# Compile openssl with \-DPURIFY, useful when one wants to
@@ -16,7 +18,7 @@
 Summary(uk.UTF-8):	Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:		openssl
 Version:	0.9.8e
-Release:	2
+Release:	3
 License:	Apache-style License
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
@@ -195,6 +197,10 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+# XXX: gcc 4.2 hack
+cp crypto/asn1/asn1.h crypto/asn1/asn1.h.X
+cp crypto/ocsp/ocsp.h crypto/ocsp/ocsp.h.X
+cp crypto/pem/pem.h crypto/pem/pem.h.X
 %patch6 -p1
 
 %build
@@ -345,6 +351,11 @@
 rm $RPM_BUILD_ROOT%{_mandir}/man7/Modes_of_DES.7
 echo ".so openssl_des_modes.7" > $RPM_BUILD_ROOT%{_mandir}/man7/Modes_of_DES.7
 
+# XXX: gcc 4.2 hack
+install crypto/asn1/asn1.h.X $RPM_BUILD_ROOT%{_includedir}/%{name}/asn1.h
+install crypto/ocsp/ocsp.h.X $RPM_BUILD_ROOT%{_includedir}/%{name}/ocsp.h
+install crypto/pem/pem.h.X $RPM_BUILD_ROOT%{_includedir}/%{name}/pem.h
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -449,6 +460,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.170  2007/02/24 23:34:21  arekm
+- rel 3; more gcc 4.2 hacks until issue properly resolved
+
 Revision 1.169  2007/02/24 20:58:55  arekm
 - gcc_4_2 patch still needed unfortunately
 
================================================================

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