rpms/conexus/devel conexus-0.8.0-openssl.patch, NONE, 1.1 conexus.spec, 1.22, 1.23

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/conexus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4980

Modified Files:
	conexus.spec 
Added Files:
	conexus-0.8.0-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
- rebuilt with new openssl


conexus-0.8.0-openssl.patch:
 context.cpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE conexus-0.8.0-openssl.patch ---
diff -up conexus-0.8.0/conexus-ssl/context.cpp.openssl conexus-0.8.0/conexus-ssl/context.cpp
--- conexus-0.8.0/conexus-ssl/context.cpp.openssl	2008-11-10 18:27:15.000000000 +0100
+++ conexus-0.8.0/conexus-ssl/context.cpp	2009-08-25 12:13:57.000000000 +0200
@@ -29,7 +29,11 @@ namespace Conexus
     Context::Context ( Method m ) :
         m_method ( m )
     {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+      const SSL_METHOD* meth;
+#else
       SSL_METHOD* meth;
+#endif
 
       switch ( m )
       {


Index: conexus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/conexus/devel/conexus.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- conexus.spec	21 Aug 2009 12:51:45 -0000	1.22
+++ conexus.spec	25 Aug 2009 10:17:17 -0000	1.23
@@ -6,6 +6,7 @@ License:          GPLv3
 URL:              http://conexus.sourceforge.net
 Group:            System Environment/Libraries
 Source:           http://downloads.sourceforge.net/conexus/%{name}-%{version}.tar.bz2
+Patch1:           conexus-0.8.0-openssl.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    glibmm24-devel >= 2.6.0
 BuildRequires:    cppunit-devel >= 1.11
@@ -160,6 +161,7 @@ developing conexus-nspr applications.
 
 %prep
 %setup -q
+%patch1 -p1 -b .openssl
 
 %build
 %configure --enable-static=no --enable-gtkmm --enable-demos --enable-dbus
@@ -279,7 +281,7 @@ find %{buildroot} -type f -name "*.la" -
 %{_includedir}/conexus-0.8/conexus-nss/
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.8.0-3
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-2