packages: qt-plugin-qca-tls/qt-plugin-qca-tls.spec, qt-plugin-qca-tls/opens...

[glen]

Author: glen                         Date: Mon May  3 06:18:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build with openssl 1.0; rel 11

---- Files affected:
packages/qt-plugin-qca-tls:
   qt-plugin-qca-tls.spec (1.19 -> 1.20) , openssl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/qt-plugin-qca-tls/qt-plugin-qca-tls.spec
diff -u packages/qt-plugin-qca-tls/qt-plugin-qca-tls.spec:1.19 packages/qt-plugin-qca-tls/qt-plugin-qca-tls.spec:1.20
--- packages/qt-plugin-qca-tls/qt-plugin-qca-tls.spec:1.19	Wed Apr 21 19:07:31 2010
+++ packages/qt-plugin-qca-tls/qt-plugin-qca-tls.spec	Mon May  3 08:18:28 2010
@@ -1,17 +1,17 @@
 # $Revision$, $Date$
-%define		rname qca-tls
-#
+%define		realname qca-tls
 Summary:	Qt Cryptographic Architecture (QCA) SSL/TLS plugin
 Summary(pl.UTF-8):	Wtyczka SSL/TLS dla Qt Cryptographic Architecture (QCA)
-Name:		qt-plugin-%{rname}
+Name:		qt-plugin-%{realname}
 Version:	1.0
-Release:	10
+Release:	11
 Epoch:		1
 License:	LGPL v2.1
 Group:		Libraries
-Source0:	http://delta.affinix.com/qca/%{rname}-1.0.tar.bz2
+Source0:	http://delta.affinix.com/qca/%{realname}-%{version}.tar.bz2
 # Source0-md5:	886b1f60fc31de3b1a0bd93281e27b73
 Patch0:		%{name}-openssl9x.patch
+Patch1:		openssl.patch
 URL:		http://delta.affinix.com/qca/
 BuildRequires:	libstdc++-devel
 BuildRequires:	openssl-devel >= 0.9.7d
@@ -30,14 +30,15 @@
 korzystających z Qt Cryptographic Architecture (QCA).
 
 %prep
-%setup -qn %{rname}-%{version}
+%setup -qn %{realname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 export QTDIR=%{_prefix}
 ./configure
 
-qmake %{rname}.pro \
+qmake %{realname}.pro \
 	QMAKE_CXX="%{__cxx}" \
 	QMAKE_LINK="%{__cxx}" \
 	QMAKE_CXXFLAGS_RELEASE="%{rpmcflags}" \
@@ -65,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2010/05/03 06:18:28  glen
+- fix build with openssl 1.0; rel 11
+
 Revision 1.19  2010/04/21 17:07:31  arekm
 - release 10
 

================================================================
Index: packages/qt-plugin-qca-tls/openssl.patch
diff -u /dev/null packages/qt-plugin-qca-tls/openssl.patch:1.1
--- /dev/null	Mon May  3 08:18:33 2010
+++ packages/qt-plugin-qca-tls/openssl.patch	Mon May  3 08:18:28 2010
@@ -0,0 +1,14 @@
+--- /home/users/glen/rpm/BUILD.i686-linux/qca-tls-1.0/qca-tls.cpp~	2010-05-03 09:17:21.000000000 +0300
++++ /home/users/glen/rpm/BUILD.i686-linux/qca-tls-1.0/qca-tls.cpp	2010-05-03 09:17:23.922394731 +0300
+@@ -953,7 +953,11 @@
+ 	RSAKeyContext *key;
+ 
+ 	SSL *ssl;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD *method;
++#else
+ 	SSL_METHOD *method;
++#endif
+ 	SSL_CTX *context;
+ 	BIO *rbio, *wbio;
+ 	CertContext cc;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt-plugin-qca-tls/qt-plugin-qca-tls.spec?r1=1.19&r2=1.20&f=u