[packages/gsoap] - updated to 2.8.70
adamg
adamg at pld-linux.org
Wed Oct 3 17:22:51 CEST 2018
commit 96d05e8ce29434c39fad90e958745e7fbbebdd61
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date: Wed Oct 3 17:22:38 2018 +0200
- updated to 2.8.70
gsoap-libtool.patch | 91 +++++++++++++++++++++--------------------------------
gsoap.spec | 12 ++++---
2 files changed, 42 insertions(+), 61 deletions(-)
---
diff --git a/gsoap.spec b/gsoap.spec
index c51eb23..fd50bff 100644
--- a/gsoap.spec
+++ b/gsoap.spec
@@ -3,13 +3,14 @@
Summary: gSOAP - a development toolkit for Web services
Summary(pl.UTF-8): gSOAP - zestawem narzędzi programistycznych dla usług WWW
Name: gsoap
-Version: 2.8.11
-Release: 2
+Version: 2.8.70
+Release: 1
License: gSOAP / GPL
Group: Development/Libraries
-Source0: http://downloads.sourceforge.net/gsoap2/%{name}_%{version}.zip
-# Source0-md5: ea2d7ee876d274a188b8fbb365702eec
+Source0: http://downloads.sourceforge.net/gsoap2/gsoap-2.8/%{name}_%{version}.zip
+# Source0-md5: 5704bbfe8ba1c1e8c85130e534ed6368
Patch0: %{name}-libtool.patch
+Patch1: %{name}-xlocale.patch
URL: http://www.cs.fsu.edu/~engelen/soap.html
BuildRequires: autoconf
BuildRequires: automake
@@ -64,10 +65,11 @@ Statyczna biblioteka %{name}.
%prep
%setup -q -n %{name}-2.8
%patch0 -p1
+%patch1 -p1
# remove stuff with gsoap license only - not GPL
%{__rm} -r gsoap/extras gsoap/mod_gsoap gsoap/Symbian
-%{__sed} -i -e 's!$(srcdir)/extras/\*!!' gsoap/Makefile.am
+%{__sed} -i -e 's!$(top_srcdir)/gsoap/extras/\*!!' gsoap/Makefile.am
%build
%{__libtoolize}
diff --git a/gsoap-libtool.patch b/gsoap-libtool.patch
index 399cd34..41c5f1c 100644
--- a/gsoap-libtool.patch
+++ b/gsoap-libtool.patch
@@ -1,95 +1,96 @@
-diff -ur gsoap-2.8.orig/configure.in gsoap-2.8/configure.in
---- gsoap-2.8.orig/configure.in 2011-10-22 23:12:11.000000000 +0200
-+++ gsoap-2.8/configure.in 2011-11-01 06:25:39.071999543 +0100
+diff -ur gsoap-2.8.orig/configure.ac gsoap-2.8/configure.ac
+--- gsoap-2.8.orig/configure.ac 2011-10-22 23:12:11.000000000 +0200
++++ gsoap-2.8/configure.ac 2011-11-01 06:25:39.071999543 +0100
@@ -16,8 +16,7 @@
AM_PROG_LEX
AC_PROG_YACC
AC_PROG_CPP
-AC_PROG_RANLIB
--#AC_PROG_LIBTOOL
+-#AM_PROG_LIBTOOL
+AM_PROG_LIBTOOL
AC_PROG_LN_S
AC_PROG_AWK
AC_PROG_INSTALL
-@@ -226,13 +225,13 @@
- WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP"
- WSDL2H_EXTRA_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
+@@ -278,7 +278,7 @@
+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
+ SAMPLE_INCLUDES=
SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
+ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la"
else
AC_MSG_RESULT(no)
WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
-- WSDL2H_EXTRA_LIBS="-lssl -lcrypto -lz"
-+ WSDL2H_EXTRA_LIBS=
+@@ -286,7 +286,7 @@
+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz"
+ SAMPLE_INCLUDES=
SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
+ WSDL2H_SOAP_CPP_LIB="libgsoapssl++.la"
fi
- if test -n "$OPENSSL"; then
- WSDL2H_EXTRA_FLAGS="-I${OPENSSL}/include ${WSDL2H_EXTRA_FLAGS}"
-@@ -244,7 +243,7 @@
+ if test -n "$ZLIB"; then
+ WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
+@@ -305,7 +304,7 @@
WSDL2H_EXTRA_FLAGS=
- WSDL2H_EXTRA_LIBS=
SAMPLE_SSL_LIBS=
+ SAMPLE_INCLUDES=
- WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
+ WSDL2H_SOAP_CPP_LIB="libgsoap++.la"
fi
- AC_SUBST(WSDL2H_EXTRA_FLAGS)
- AC_SUBST(WSDL2H_EXTRA_LIBS)
+ AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes")
+ AC_SUBST(WITH_OPENSSL)
diff -ur gsoap-2.8.orig/gsoap/Makefile.am gsoap-2.8/gsoap/Makefile.am
--- gsoap-2.8.orig/gsoap/Makefile.am 2011-10-22 23:12:12.000000000 +0200
+++ gsoap-2.8/gsoap/Makefile.am 2011-11-01 06:25:39.071999543 +0100
@@ -34,20 +34,30 @@
dom_cpp.cpp: dom.cpp
- $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp
+ $(LN_S) -f $(top_srcdir)/gsoap/dom.cpp dom_cpp.cpp
-lib_LIBRARIES = libgsoap.a libgsoap++.a libgsoapck.a libgsoapck++.a libgsoapssl.a libgsoapssl++.a
+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
-libgsoap_a_SOURCES = stdsoap2.c dom.c
--libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
+-libgsoap_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform)
-libgsoap___a_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
--libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
+-libgsoap___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform)
-libgsoapck_a_SOURCES = stdsoap2_ck.c dom.c
--libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
+-libgsoapck_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-libgsoapck___a_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
--libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
+-libgsoapck___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-libgsoapssl_a_SOURCES = stdsoap2_ssl.c dom.c
--libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
+-libgsoapssl_a_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
--libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
-+SOVERSION = 0
+-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
++SOVERSION=0
+
+libgsoap_la_SOURCES = stdsoap2.c dom.c
-+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
++libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform)
+libgsoap_la_LDFLAGS = -version-info $(SOVERSION)
+libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
-+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
++libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform)
+libgsoap___la_LDFLAGS = -version-info $(SOVERSION)
+libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c
-+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
++libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
+libgsoapck_la_LDFLAGS = -version-info $(SOVERSION)
+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
-+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
++libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
+libgsoapck___la_LDFLAGS = -version-info $(SOVERSION)
+libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
-+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
++libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION)
+libgsoapssl_la_LIBADD = -lssl -lcrypto -lz
+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
-+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM
++libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION)
+libgsoapssl___la_LIBADD = -lssl -lcrypto -lz
- BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES)
+ BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
diff -ur gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am gsoap-2.8/gsoap/samples/autotest/Makefile.am
--- gsoap-2.8.orig/gsoap/samples/autotest/Makefile.am 2011-10-22 23:12:14.000000000 +0200
+++ gsoap-2.8/gsoap/samples/autotest/Makefile.am 2011-11-01 06:25:39.071999543 +0100
@@ -14,7 +14,7 @@
- WSDLINPUT=$(srcdir)/examples.wsdl
- SOAPHEADER=$(srcdir)/examples.h
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h
SOAP_CPP_SRC=soapC.cpp soapServer.cpp
-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la
@@ -100,8 +101,8 @@ diff -ur gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am gsoap-2.8/gsoap/sa
--- gsoap-2.8.orig/gsoap/samples/databinding/Makefile.am 2011-10-22 23:12:15.000000000 +0200
+++ gsoap-2.8/gsoap/samples/databinding/Makefile.am 2011-11-01 06:25:39.071999543 +0100
@@ -14,7 +14,7 @@
- WSDLINPUT=$(srcdir)/address.xsd
- SOAPHEADER=$(srcdir)/address.h
+ WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd
+ SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h
SOAP_CPP_SRC=addressC.cpp
-SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la
@@ -131,25 +132,3 @@ diff -ur gsoap-2.8.orig/gsoap/samples/Makefile.defines gsoap-2.8/gsoap/samples/M
+SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.la
+SOAP_CPP_LIB_CK=$(top_builddir)/gsoap/libgsoapck++.la
+SOAP_CPP_LIB_SSL=$(top_builddir)/gsoap/libgsoapssl++.la
-diff -ur gsoap-2.8.orig/gsoapssl.pc.in gsoap-2.8/gsoapssl.pc.in
---- gsoap-2.8.orig/gsoapssl.pc.in 2011-10-22 23:12:15.000000000 +0200
-+++ gsoap-2.8/gsoapssl.pc.in 2011-11-01 06:28:07.452002816 +0100
-@@ -7,5 +7,6 @@
- Description: SOAP C Web Services with SSL and ZLIB
- Version: @VERSION@
- Requires:
--Libs: -L${libdir} -lgsoapssl @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
-+Libs: -L${libdir} -lgsoapssl
-+Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
- Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
-diff -ur gsoap-2.8.orig/gsoapssl++.pc.in gsoap-2.8/gsoapssl++.pc.in
---- gsoap-2.8.orig/gsoapssl++.pc.in 2011-10-22 23:12:15.000000000 +0200
-+++ gsoap-2.8/gsoapssl++.pc.in 2011-11-01 06:28:06.400004525 +0100
-@@ -7,5 +7,6 @@
- Description: SOAP C++ Web Services with SSL and ZLIB
- Version: @VERSION@
- Requires:
--Libs: -L${libdir} -lgsoapssl++ @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
-+Libs: -L${libdir} -lgsoapssl++
-+Libs.private: @SAMPLE_SSL_LIBS@ @SAMPLE_EXTRA_LIBS@
- Cflags: @SOAPCPP2_IPV6@ -DWITH_OPENSSL -DWITH_DOM -DWITH_COOKIES -DWITH_GZIP -I${includedir}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gsoap.git/commitdiff/96d05e8ce29434c39fad90e958745e7fbbebdd61
More information about the pld-cvs-commit
mailing list