diff --git a/gsoap-01-sharedlibs.diff b/gsoap-01-sharedlibs.diff index 7b7900f..05a095e 100644 --- a/gsoap-01-sharedlibs.diff +++ b/gsoap-01-sharedlibs.diff @@ -10,21 +10,21 @@ build: always use shared libraries gsoap/samples/databinding/Makefile.am | 2 +- 4 files changed, 25 insertions(+), 20 deletions(-) -Index: gsoap-2.8.3/configure.in +Index: gsoap-2.8.14/configure.in =================================================================== ---- gsoap-2.8.3.orig/configure.in -+++ gsoap-2.8.3/configure.in +--- gsoap-2.8.14.orig/configure.in ++++ gsoap-2.8.14/configure.in @@ -16,8 +16,7 @@ AM_PROG_CC_C_O AM_PROG_LEX AC_PROG_YACC AC_PROG_CPP -AC_PROG_RANLIB --#AC_PROG_LIBTOOL +-#AM_PROG_LIBTOOL +LT_INIT AC_PROG_LN_S AC_PROG_AWK AC_PROG_INSTALL -@@ -222,13 +221,13 @@ if test "x$with_openssl" = "xyes"; then +@@ -226,13 +225,13 @@ if test "x$with_openssl" = "xyes"; then WSDL2H_EXTRA_FLAGS="-DWITH_GNUTLS -DWITH_GZIP" WSDL2H_EXTRA_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" @@ -40,7 +40,7 @@ Index: gsoap-2.8.3/configure.in fi if test -n "$OPENSSL"; then WSDL2H_EXTRA_FLAGS="-I${OPENSSL}/include ${WSDL2H_EXTRA_FLAGS}" -@@ -240,7 +239,7 @@ else +@@ -244,7 +243,7 @@ else WSDL2H_EXTRA_FLAGS= WSDL2H_EXTRA_LIBS= SAMPLE_SSL_LIBS= @@ -49,10 +49,10 @@ Index: gsoap-2.8.3/configure.in fi AC_SUBST(WSDL2H_EXTRA_FLAGS) AC_SUBST(WSDL2H_EXTRA_LIBS) -Index: gsoap-2.8.3/gsoap/Makefile.am +Index: gsoap-2.8.14/gsoap/Makefile.am =================================================================== ---- gsoap-2.8.3.orig/gsoap/Makefile.am -+++ gsoap-2.8.3/gsoap/Makefile.am +--- gsoap-2.8.14.orig/gsoap/Makefile.am ++++ gsoap-2.8.14/gsoap/Makefile.am @@ -34,20 +34,26 @@ stdsoap2_ssl_cpp.cpp: stdsoap2.cpp dom_cpp.cpp: dom.cpp $(LN_S) -f $(srcdir)/dom.cpp dom_cpp.cpp @@ -93,10 +93,10 @@ Index: gsoap-2.8.3/gsoap/Makefile.am BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp $(lib_LIBRARIES) -Index: gsoap-2.8.3/gsoap/samples/autotest/Makefile.am +Index: gsoap-2.8.14/gsoap/samples/autotest/Makefile.am =================================================================== ---- gsoap-2.8.3.orig/gsoap/samples/autotest/Makefile.am -+++ gsoap-2.8.3/gsoap/samples/autotest/Makefile.am +--- gsoap-2.8.14.orig/gsoap/samples/autotest/Makefile.am ++++ gsoap-2.8.14/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 @@ -106,11 +106,11 @@ Index: gsoap-2.8.3/gsoap/samples/autotest/Makefile.am $(SOAP_CPP_SRC) : $(WSDLINPUT) $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) -Index: gsoap-2.8.3/gsoap/samples/databinding/Makefile.am +Index: gsoap-2.8.14/gsoap/samples/databinding/Makefile.am =================================================================== ---- gsoap-2.8.3.orig/gsoap/samples/databinding/Makefile.am -+++ gsoap-2.8.3/gsoap/samples/databinding/Makefile.am -@@ -14,7 +14,7 @@ SOAP_FLAGS=-2 -CS -p address -I$(top_src +--- gsoap-2.8.14.orig/gsoap/samples/databinding/Makefile.am ++++ gsoap-2.8.14/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 SOAP_CPP_SRC=addressC.cpp diff --git a/gsoap-2.8.11.tar.xz b/gsoap-2.8.11.tar.xz deleted file mode 100644 index dbee437..0000000 --- a/gsoap-2.8.11.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c72bc30e6737174cef89e93d168c07ff6bbf482319ea745e53796eda44c40de9 -size 7162664 diff --git a/gsoap-2.8.14.tar.xz b/gsoap-2.8.14.tar.xz new file mode 100644 index 0000000..277d3fd --- /dev/null +++ b/gsoap-2.8.14.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fee2410fa8082bdbb4d9109043c8ae7123891e7ceda7aa1abaa29c20e1aafca2 +size 7890404 diff --git a/gsoap-automake1_13.diff b/gsoap-automake1_13.diff new file mode 100644 index 0000000..a067638 --- /dev/null +++ b/gsoap-automake1_13.diff @@ -0,0 +1,23 @@ +From: Jan Engelhardt +Date: 2013-02-28 23:21:08.137905619 +0100 + +automake-1.13 has finally removed AM_CONFIG_HEADER. + +--- + configure.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +Index: gsoap-2.8.14/configure.in +=================================================================== +--- gsoap-2.8.14.orig/configure.in ++++ gsoap-2.8.14/configure.in +@@ -4,8 +4,7 @@ AM_INIT_AUTOMAKE(gsoap, 2.8) + AC_CONFIG_SRCDIR([gsoap/stdsoap2.cpp]) + AC_CANONICAL_HOST + +-# AC_CONFIG_HEADERS([config.h]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS([config.h]) + + # we use subdirs. + AC_PROG_MAKE_SET diff --git a/gsoap.changes b/gsoap.changes index 4adf1ed..4a1a97b 100644 --- a/gsoap.changes +++ b/gsoap.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Feb 28 22:31:47 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 2.8.14 +* Added explanation of wsdl2h option -Nname which is used to + generate a service (and its prefix name) for each service + binding (bindings are collected in one service by default). + ------------------------------------------------------------------- Wed Nov 14 22:36:29 UTC 2012 - jengelh@inai.de diff --git a/gsoap.spec b/gsoap.spec index fc45e41..de1bdf8 100644 --- a/gsoap.spec +++ b/gsoap.spec @@ -1,7 +1,7 @@ # # spec file for package gsoap # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,13 +21,14 @@ Name: gsoap Summary: Toolkit for C/C++ server and client web service applications License: SUSE-GPL-2.0+-with-openssl-exception Group: Development/Libraries/C and C++ -Version: 2.8.11 +Version: 2.8.14 Release: 0 Url: http://gsoap2.sf.net/ -#DL-URL: http://downloads.sf.net/gsoap2/gsoap_2.8.11.zip +#DL-URL: http://downloads.sf.net/gsoap2/gsoap_2.8.14.zip Source: gsoap-%version.tar.xz Source2: sanitize_source.sh +Patch0: gsoap-automake1_13.diff Patch1: gsoap-01-sharedlibs.diff Patch2: gsoap-02-typepuns.diff Patch4: gsoap-04-strerror.diff @@ -110,7 +111,7 @@ symlinks for libgsoap. tar -xf "%{S:0}" --use=xz; %setup -DTq %endif -%patch -P 1 -P 2 -P 4 -P 5 -p1 +%patch -P 0 -P 1 -P 2 -P 4 -P 5 -p1 %build # Rebuild configure - fix that utterly long mktime test. diff --git a/sanitize_source.sh b/sanitize_source.sh index 65f60da..7fd3387 100644 --- a/sanitize_source.sh +++ b/sanitize_source.sh @@ -2,7 +2,7 @@ # # Shrink the gsoap archive from 18 MB -> 7 MB. # -# Requires: fdupes hxtools +# Requires: fdupes, hxtools if ! which fdupes >/dev/null; then echo "fdupes not installed."; @@ -13,7 +13,7 @@ if ! which fduphl >/dev/null; then exit 1; fi; -version="2.8.11"; +version="2.8.14"; shortver="2.8"; # agh... rm -Rf "gsoap-$shortver" "gsoap-$version";