packages: dclib/dclib.spec, dclib/dclib-ssl.patch (NEW), dclib/dclib-DESTDI...

[blues]

Author: blues                        Date: Thu Apr 29 21:15:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 0.3.23 - ssl patch from upstream added, obsolete removed, no longer
  static subpackage

---- Files affected:
packages/dclib:
   dclib.spec (1.66 -> 1.67) , dclib-ssl.patch (NONE -> 1.1)  (NEW), dclib-DESTDIR.patch (1.1 -> NONE)  (REMOVED), dclib-include.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/dclib/dclib.spec
diff -u packages/dclib/dclib.spec:1.66 packages/dclib/dclib.spec:1.67
--- packages/dclib/dclib.spec:1.66	Wed Apr 21 19:00:37 2010
+++ packages/dclib/dclib.spec	Thu Apr 29 23:15:33 2010
@@ -6,16 +6,15 @@
 Summary:	DirectConnect support library for dcgui-qt
 Summary(pl.UTF-8):	Biblioteka obsługująca DirectConnect dla dcgui-qt
 Name:		dclib
-Version:	0.3.13
-Release:	3
+Version:	0.3.23
+Release:	1
 Epoch:		1
 License:	GPL
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/wxdcgui/%{name}-%{version}.tar.bz2
-# Source0-md5:	d0802777ab7555309debd64f71397faf
+# Source0-md5:	6852e420e48d09b514fcb9f783611cdc
 Patch0:		%{name}-lying_tags.patch
-Patch1:		%{name}-include.patch
-Patch2:		%{name}-DESTDIR.patch
+Patch1:		%{name}-ssl.patch
 URL:		http://wxdcgui.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -42,6 +41,7 @@
 Requires:	libstdc++-devel
 Requires:	libxml2-devel > 2.0.0
 Requires:	openssl-devel
+Obsoletes:	dclib-static
 
 %description devel
 Header files for dclib.
@@ -49,29 +49,12 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe dla dclib.
 
-%package static
-Summary:	Static dclib library
-Summary(pl.UTF-8):	Statyczna biblioteka dclib
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
-
-%description static
-Static dclib library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka dclib.
-
 %prep
 %setup -q
 %{?with_lying:%patch0 -p1}
 %patch1 -p1
-%patch2 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
 %configure
 %{__make}
 
@@ -91,25 +74,28 @@
 %defattr(644,root,root,755)
 %doc AUTHORS README
 %attr(755,root,root) %{_libdir}/libdc.so.*.*
-%{_datadir}/dclib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*.so
 %{_libdir}/*.la
-%{_includedir}/dclib
+%dir %{_includedir}/dclib-0.3/
+%dir %{_includedir}/dclib-0.3/dclib/core
+%{_includedir}/dclib-0.3/dclib/core/*.h
+%dir %{_includedir}/dclib-0.3/dclib
+%{_includedir}/dclib-0.3/dclib/*.h
 %{_pkgconfigdir}/*.pc
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/*.a
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2010/04/29 21:15:33  blues
+- 0.3.23 - ssl patch from upstream added, obsolete removed, no longer
+  static subpackage
+
 Revision 1.66  2010/04/21 17:00:37  arekm
 - release 3
 

================================================================
Index: packages/dclib/dclib-ssl.patch
diff -u /dev/null packages/dclib/dclib-ssl.patch:1.1
--- /dev/null	Thu Apr 29 23:15:38 2010
+++ packages/dclib/dclib-ssl.patch	Thu Apr 29 23:15:33 2010
@@ -0,0 +1,59 @@
+diff -up dclib-0.3.23/dclib/core/cssl.cpp.openssl dclib-0.3.23/dclib/core/cssl.cpp
+--- dclib-0.3.23/dclib/core/cssl.cpp.openssl	2009-01-07 23:13:52.000000000 +0100
++++ dclib-0.3.23/dclib/core/cssl.cpp	2009-08-25 14:12:21.000000000 +0200
+@@ -86,7 +86,11 @@ void CSSL::DeInitSSLLibrary()
+ /** */
+ SSL_CTX * CSSL::InitClientCTX()
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD *method;
++#else
+ 	SSL_METHOD *method;
++#endif
+ 	SSL_CTX *ctx = NULL;
+ 
+ 	method = SSLv23_client_method();		/* Create new client-method instance */
+@@ -109,7 +113,11 @@ SSL_CTX * CSSL::InitClientCTX()
+ /** */
+ SSL_CTX * CSSL::InitServerCTX()
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD *method;
++#else
+ 	SSL_METHOD *method;
++#endif
+ 	SSL_CTX *ctx = NULL;
+ 
+ 	method = SSLv23_server_method();		/* Create new client-method instance */
+@@ -130,9 +138,14 @@ SSL_CTX * CSSL::InitServerCTX()
+ /** */
+ SSL_CTX * CSSL::NewTLSv1ClientCTX()
+ {
+-	SSL_METHOD * method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD *method;
++#else
++	SSL_METHOD *method;
++#endif
+ 	SSL_CTX * ctx = NULL;
+ 	
++	method = TLSv1_client_method();
+ 	if ( method != NULL )
+ 	{
+ 		ctx = SSL_CTX_new(method);
+@@ -149,9 +162,14 @@ SSL_CTX * CSSL::NewTLSv1ClientCTX()
+ /** */
+ SSL_CTX * CSSL::NewTLSv1ServerCTX()
+ {
+-	SSL_METHOD * method = TLSv1_server_method();
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD *method;
++#else
++	SSL_METHOD *method;
++#endif
+ 	SSL_CTX * ctx = NULL;
+ 	
++	method = TLSv1_server_method();
+ 	if ( method != NULL )
+ 	{
+ 		ctx = SSL_CTX_new(method);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dclib/dclib.spec?r1=1.66&r2=1.67&f=u