From a86f1a4eeec4dbb988f5799e527b681342853c52be09b4e081b86d89ccd580ce Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 21 Nov 2016 19:17:45 +0000
Subject: [PATCH] - Drop gsoap-locale.diff (upstreamed)

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gsoap?expand=0&rev=75
---
 gsoap-locale.diff | 34 ----------------------------------
 gsoap.changes     |  1 +
 gsoap.spec        |  5 +----
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 gsoap-locale.diff

diff --git a/gsoap-locale.diff b/gsoap-locale.diff
deleted file mode 100644
index c7c0d2e..0000000
--- a/gsoap-locale.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-
-Always force locale-aware formatting and parsing.
-Fix build error with -DWITH_C_LOCALE
-
-References: https://sourceforge.net/p/gsoap2/bugs/1079/
-References: https://sourceforge.net/p/gsoap2/bugs/1080/
----
- gsoap/stdsoap2.h |    5 +++++
- 1 file changed, 5 insertions(+)
-
-Index: gsoap-2.8.39/gsoap/stdsoap2.h
-===================================================================
---- gsoap-2.8.39.orig/gsoap/stdsoap2.h
-+++ gsoap-2.8.39/gsoap/stdsoap2.h
-@@ -57,6 +57,10 @@ A commercial use license is available fr
- # include "soapdefs.h"          /* include user-defined stuff in soapdefs.h */
- #endif
- 
-+#ifndef WITH_C_LOCALE
-+#	define WITH_C_LOCALE 1
-+#endif
-+
- #ifndef _THREAD_SAFE
- # define _THREAD_SAFE
- #endif
-@@ -659,6 +663,7 @@ extern intmax_t __strtoull(const char*,
- #  define SOAP_FREELOCALE(soap) (void)((soap)->c_locale && (_free_locale((soap)->c_locale), ((soap)->c_locale = NULL)))
- # else
- #  include <xlocale.h>
-+#  include <locale.h>
- #  define SOAP_LOCALE_T locale_t
- #  define SOAP_LOCALE(soap) ((soap)->c_locale ? (soap)->c_locale : ((soap)->c_locale = newlocale(LC_ALL_MASK, "C", NULL)))
- #  define SOAP_FREELOCALE(soap) (void)((soap)->c_locale && (freelocale((soap)->c_locale), ((soap)->c_locale = NULL)))
diff --git a/gsoap.changes b/gsoap.changes
index 05c51d4..e8d0028 100644
--- a/gsoap.changes
+++ b/gsoap.changes
@@ -6,6 +6,7 @@ Mon Nov 21 18:39:11 UTC 2016 - jengelh@inai.de
   REST GET, PUT, POST operations with XML data.
 * the engine sets the temporary "C" locale for floating point
   conversion on most systems.
+- Drop gsoap-locale.diff (upstreamed)
 
 -------------------------------------------------------------------
 Tue Nov 15 22:35:48 UTC 2016 - jengelh@inai.de
diff --git a/gsoap.spec b/gsoap.spec
index cd4ccf0..7c1bbb2 100644
--- a/gsoap.spec
+++ b/gsoap.spec
@@ -30,7 +30,6 @@ Source:         gsoap-%version.tar.xz
 Source2:        sanitize_source.sh
 Patch1:         gsoap-automake1_13.diff
 Patch2:         gsoap-01-sharedlibs.diff
-Patch3:         gsoap-locale.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -85,7 +84,7 @@ available or under development.
 %prep
 %setup -q
 cmp gsoap/stdsoap2.cpp gsoap/stdsoap2.c
-%patch -P 1 -P 2 -P 3 -p1
+%patch -P 1 -P 2 -p1
 ln -fs stdsoap2.cpp gsoap/stdsoap2.c
 
 %build
@@ -97,8 +96,6 @@ perl -i -lpe 's{AC_INIT\(gsoap, 2.8\)}{AC_INIT([gsoap], [%version])}' \
 # Also needed because Makefile.am and configure.ac are touched.
 autoreconf -fi
 
-export CFLAGS="%optflags -DWITH_C_LOCALE=1"
-export CXXFLAGS="$CFLAGS"
 %configure --enable-ipv6 --disable-static
 pushd gsoap/src/
 # build prerequisites for parallel build first