- 0.3.23 - ssl patch from upstream added, obsolete removed, no longer

  static subpackage

Changed files:
    dclib-DESTDIR.patch -> 1.2
    dclib-include.patch -> 1.3
    dclib-ssl.patch -> 1.1
    dclib.spec -> 1.67

diff --git a/dclib-DESTDIR.patch b/dclib-DESTDIR.patch
deleted file mode 100644 (file)
index 3284056..0000000
--- a/dclib-DESTDIR.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./dclib/Makefile.am.org    2006-11-07 02:42:12.000000000 +0000
-+++ ./dclib/Makefile.am        2007-08-09 11:00:23.000000000 +0000
-@@ -30,5 +30,5 @@
- csearchsocket.h
- 
- install-data-local:
--      $(mkinstalldirs) $(datadir)/dclib
--      $(mkinstalldirs) $(datadir)/dclib/plugin
-+      $(mkinstalldirs) $(DESTDIR)$(datadir)/dclib
-+      $(mkinstalldirs) $(DESTDIR)$(datadir)/dclib/plugin
---- ./Makefile.am.org  2006-11-07 02:42:12.000000000 +0000
-+++ ./Makefile.am      2007-08-09 10:59:37.000000000 +0000
-@@ -16,8 +16,8 @@
- MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 
- 
- install-data-local:
--      $(mkinstalldirs) $(libdir)/pkgconfig
--      $(INSTALL_DATA) dclib.pc $(libdir)/pkgconfig
-+      $(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig
-+      $(INSTALL_DATA) dclib.pc $(DESTDIR)$(libdir)/pkgconfig
- 
- package-messages:
-       $(MAKE) -f admin/Makefile.common package-messages

diff --git a/dclib-include.patch b/dclib-include.patch
deleted file mode 100644 (file)
index 074a57c..0000000
--- a/dclib-include.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur dclib-0.3.9.orig/dclib/hash/TigerHash.h dclib-0.3.9.include/dclib/hash/TigerHash.h
---- dclib-0.3.9.orig/dclib/hash/TigerHash.h    2007-03-07 01:48:49.000000000 +0100
-+++ dclib-0.3.9.include/dclib/hash/TigerHash.h 2007-06-04 15:23:40.000000000 +0200
-@@ -19,9 +19,7 @@
- #if !defined(TIGER_HASH_H)
- #define TIGER_HASH_H
- 
--#if _MSC_VER > 1000
--#pragma once
--#endif // _MSC_VER > 1000
-+#include <inttypes.h>
- 
- class TigerHash {
- public:

diff --git a/dclib-ssl.patch b/dclib-ssl.patch
new file mode 100644 (file)
index 0000000..f124a21
--- /dev/null
+++ b/dclib-ssl.patch
@@ -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);

diff --git a/dclib.spec b/dclib.spec
index 5ea977481adf559d421c0c2da85fefc849ddf967..eb32b3985ef10ad72f7239f72acff3eff971b71f 100644 (file)
--- a/dclib.spec
+++ b/dclib.spec
@@ -5,16 +5,15 @@
 Summary:       DirectConnect support library for dcgui-qt
 Summary(pl.UTF-8):     Biblioteka obsługująca DirectConnect dla dcgui-qt
 Name:          dclib
 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
 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
 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
 URL:           http://wxdcgui.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake


@@ -41,6 +40,7 @@ Requires:     bzip2-devel
 Requires:      libstdc++-devel
 Requires:      libxml2-devel > 2.0.0
 Requires:      openssl-devel
 Requires:      libstdc++-devel
 Requires:      libxml2-devel > 2.0.0
 Requires:      openssl-devel

+Obsoletes:     dclib-static

 
 %description devel
 Header files for dclib.
 
 %description devel
 Header files for dclib.


@@ -48,29 +48,12 @@ Header files for dclib.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe dla dclib.
 
 %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
 %prep
 %setup -q
 %{?with_lying:%patch0 -p1}
 %patch1 -p1

-%patch2 -p1

 
 %build
 
 %build

-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}

 %configure
 %{__make}
 
 %configure
 %{__make}
 


@@ -90,15 +73,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS README
 %attr(755,root,root) %{_libdir}/libdc.so.*.*
 %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
 
 %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
 %{_pkgconfigdir}/*.pc

-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/*.a