Accepting request 510107 from devel:libraries:c_c++

- Remove gnutls because openssl overrides it already (forwarded request 510051 from olh)

OBS-URL: https://build.opensuse.org/request/show/510107
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gsoap?expand=0&rev=32
This commit is contained in:
Dominique Leuenberger 2017-07-17 07:02:40 +00:00 committed by Git OBS Bridge
commit f32a45c577
6 changed files with 63 additions and 50 deletions

View File

@ -18,10 +18,10 @@ build: always use shared libraries
gsoap/samples/databinding/Makefile.am | 2 -
12 files changed, 40 insertions(+), 20 deletions(-)
Index: gsoap-2.8.42/configure.ac
Index: gsoap-2.8.49/configure.ac
===================================================================
--- gsoap-2.8.42.orig/configure.ac
+++ gsoap-2.8.42/configure.ac
--- gsoap-2.8.49.orig/configure.ac
+++ gsoap-2.8.49/configure.ac
@@ -15,8 +15,8 @@ AM_PROG_CC_C_O
AM_PROG_LEX
AC_PROG_YACC
@ -33,7 +33,7 @@ Index: gsoap-2.8.42/configure.ac
AC_PROG_LN_S
AC_PROG_AWK
AC_PROG_INSTALL
@@ -241,7 +241,7 @@ if test "x$with_openssl" = "xyes"; then
@@ -258,7 +258,7 @@ if test "x$with_openssl" = "xyes"; then
WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
SAMPLE_INCLUDES=
SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
@ -42,7 +42,7 @@ Index: gsoap-2.8.42/configure.ac
else
AC_MSG_RESULT(no)
WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
@@ -250,7 +250,7 @@ if test "x$with_openssl" = "xyes"; then
@@ -267,7 +267,7 @@ if test "x$with_openssl" = "xyes"; then
WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} ../plugin/httpda.c ../plugin/smdevp.c ../plugin/threads.c -lssl -lcrypto -lz"
SAMPLE_INCLUDES=
SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
@ -51,7 +51,7 @@ Index: gsoap-2.8.42/configure.ac
fi
if test -n "$ZLIB"; then
WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
@@ -269,7 +269,7 @@ else
@@ -286,7 +286,7 @@ else
WSDL2H_EXTRA_FLAGS=
SAMPLE_SSL_LIBS=
SAMPLE_INCLUDES=
@ -60,10 +60,10 @@ Index: gsoap-2.8.42/configure.ac
fi
AC_SUBST(WSDL2H_EXTRA_FLAGS)
AC_SUBST(WSDL2H_EXTRA_LIBS)
Index: gsoap-2.8.42/gsoap/Makefile.am
Index: gsoap-2.8.49/gsoap/Makefile.am
===================================================================
--- gsoap-2.8.42.orig/gsoap/Makefile.am
+++ gsoap-2.8.42/gsoap/Makefile.am
--- gsoap-2.8.49.orig/gsoap/Makefile.am
+++ gsoap-2.8.49/gsoap/Makefile.am
@@ -34,20 +34,32 @@ stdsoap2_ssl_cpp.cpp: stdsoap2.cpp
dom_cpp.cpp: dom.cpp
$(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp
@ -72,96 +72,96 @@ Index: gsoap-2.8.42/gsoap/Makefile.am
+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 -DWITH_COOKIES
-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 -DWITH_COOKIES
-libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+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 = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoap.sym
+EXTRA_libgsoap_la_DEPENDENCIES = gsoap.sym
+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 = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoap++.sym
+EXTRA_libgsoap___la_DEPENDENCIES = gsoap++.sym
+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 = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoapck.sym
+EXTRA_libgsoapck_la_DEPENDENCIES = gsoapck.sym
+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 = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoapck++.sym
+EXTRA_libgsoapck___la_DEPENDENCIES = gsoapck++.sym
+libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
+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 = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoapssl.sym
+EXTRA_libgsoapssl_la_DEPENDENCIES = gsoapssl.sym
+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 -DWITH_COOKIES
+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 = -release ${PACKAGE_VERSION} -Wl,--version-script=gsoapssl++.sym
+EXTRA_libgsoapssl___la_DEPENDENCIES = gsoapssl++.sym
BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
Index: gsoap-2.8.42/gsoap/gsoap++.sym
Index: gsoap-2.8.49/gsoap/gsoap++.sym
===================================================================
--- /dev/null
+++ gsoap-2.8.42/gsoap/gsoap++.sym
+++ gsoap-2.8.49/gsoap/gsoap++.sym
@@ -0,0 +1 @@
+GSOAPXX { global: *; };
Index: gsoap-2.8.42/gsoap/gsoap.sym
Index: gsoap-2.8.49/gsoap/gsoap.sym
===================================================================
--- /dev/null
+++ gsoap-2.8.42/gsoap/gsoap.sym
+++ gsoap-2.8.49/gsoap/gsoap.sym
@@ -0,0 +1 @@
+GSOAP { global: *; };
Index: gsoap-2.8.42/gsoap/gsoapck++.sym
Index: gsoap-2.8.49/gsoap/gsoapck++.sym
===================================================================
--- /dev/null
+++ gsoap-2.8.42/gsoap/gsoapck++.sym
+++ gsoap-2.8.49/gsoap/gsoapck++.sym
@@ -0,0 +1 @@
+GSOAPCKXX { global: *; };
Index: gsoap-2.8.42/gsoap/gsoapck.sym
Index: gsoap-2.8.49/gsoap/gsoapck.sym
===================================================================
--- /dev/null
+++ gsoap-2.8.42/gsoap/gsoapck.sym
+++ gsoap-2.8.49/gsoap/gsoapck.sym
@@ -0,0 +1 @@
+GSOAPCK { global: *; };
Index: gsoap-2.8.42/gsoap/gsoapckssl++.sym
Index: gsoap-2.8.49/gsoap/gsoapckssl++.sym
===================================================================
--- /dev/null
+++ gsoap-2.8.42/gsoap/gsoapckssl++.sym
+++ gsoap-2.8.49/gsoap/gsoapckssl++.sym
@@ -0,0 +1 @@
+GSOAPCKSSLXX { global: *; };
Index: gsoap-2.8.42/gsoap/gsoapckssl.sym
Index: gsoap-2.8.49/gsoap/gsoapckssl.sym
===================================================================
--- /dev/null
+++ gsoap-2.8.42/gsoap/gsoapckssl.sym
+++ gsoap-2.8.49/gsoap/gsoapckssl.sym
@@ -0,0 +1 @@
+GSOAPCKSSL { global: *; };
Index: gsoap-2.8.42/gsoap/gsoapssl++.sym
Index: gsoap-2.8.49/gsoap/gsoapssl++.sym
===================================================================
--- /dev/null
+++ gsoap-2.8.42/gsoap/gsoapssl++.sym
+++ gsoap-2.8.49/gsoap/gsoapssl++.sym
@@ -0,0 +1 @@
+GSOAPSSLXX { global: *; };
Index: gsoap-2.8.42/gsoap/gsoapssl.sym
Index: gsoap-2.8.49/gsoap/gsoapssl.sym
===================================================================
--- /dev/null
+++ gsoap-2.8.42/gsoap/gsoapssl.sym
+++ gsoap-2.8.49/gsoap/gsoapssl.sym
@@ -0,0 +1 @@
+GSOAPSSL { global: *; };
Index: gsoap-2.8.42/gsoap/samples/autotest/Makefile.am
Index: gsoap-2.8.49/gsoap/samples/autotest/Makefile.am
===================================================================
--- gsoap-2.8.42.orig/gsoap/samples/autotest/Makefile.am
+++ gsoap-2.8.42/gsoap/samples/autotest/Makefile.am
--- gsoap-2.8.49.orig/gsoap/samples/autotest/Makefile.am
+++ gsoap-2.8.49/gsoap/samples/autotest/Makefile.am
@@ -14,7 +14,7 @@ SOAP_FLAGS=-SL -T -I$(top_srcdir)/gsoap/
WSDLINPUT=$(srcdir)/examples.wsdl
SOAPHEADER=$(srcdir)/examples.h
@ -171,10 +171,10 @@ Index: gsoap-2.8.42/gsoap/samples/autotest/Makefile.am
$(SOAP_CPP_SRC) : $(WSDLINPUT)
$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
Index: gsoap-2.8.42/gsoap/samples/databinding/Makefile.am
Index: gsoap-2.8.49/gsoap/samples/databinding/Makefile.am
===================================================================
--- gsoap-2.8.42.orig/gsoap/samples/databinding/Makefile.am
+++ gsoap-2.8.42/gsoap/samples/databinding/Makefile.am
--- gsoap-2.8.49.orig/gsoap/samples/databinding/Makefile.am
+++ gsoap-2.8.49/gsoap/samples/databinding/Makefile.am
@@ -14,7 +14,7 @@ SOAP_FLAGS=-0 -CS -p address -I$(top_src
WSDLINPUT=$(srcdir)/address.xsd
SOAPHEADER=$(srcdir)/address.h

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be1988539a4733069f1d4e0e1782207e6faca6c996f086ad5e7f4ff202eae95d
size 18978300

3
gsoap-2.8.49.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b322c029674d8f5cf1f88eb3d4a63e15edb539569cfca1cb6bcc850b6505374c
size 19328196

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Jul 13 11:39:49 UTC 2017 - olaf@aepfle.de
- Remove gnutls because openssl overrides it already
-------------------------------------------------------------------
Tue Jul 11 08:33:39 UTC 2017 - jengelh@inai.de
- Update to new upstream release 2.8.49
* union constructors are re-emitted correctly
* Improved JSON API to compile with XML data bindings, see
updated JSON API documentation on "Compiling XML-RPC/JSON
together with gSOAP XML data binding code".
-------------------------------------------------------------------
Tue Jun 27 14:03:51 UTC 2017 - jengelh@inai.de

View File

@ -17,8 +17,8 @@
Name: gsoap
%define lname libgsoap-2_8_48
Version: 2.8.48
%define lname libgsoap-2_8_49
Version: 2.8.49
Release: 0
Summary: Toolkit for SOAP/REST-based C/C++ server and client web service applications
License: SUSE-GPL-2.0+-with-openssl-exception
@ -38,7 +38,6 @@ BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: pkg-config
BuildRequires: xz
BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(libssl)
BuildRequires: pkgconfig(zlib)

View File

@ -13,7 +13,7 @@ if ! which hardlink >/dev/null; then
exit 1;
fi;
version="2.8.48"
version="2.8.49"
shortver="2.8" # agh...
if [ ! -e "gsoap_$version.zip" ]; then
wget -c "http://downloads.sf.net/gsoap2/gsoap_$version.zip"