From c49e03aeb84c31f97a9c225ba4145a16ca0f2fe0d3ede4cf84cc803db81dd880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 21 Nov 2011 17:00:16 +0000 Subject: [PATCH] Accepting request 92892 from home:rjschwei:branches:devel:libraries:c_c++ Fix build errors: remove include of curl/types.h; file no longer exists and has been empty for a while OBS-URL: https://build.opensuse.org/request/show/92892 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/xmlrpc-c?expand=0&rev=62 --- xmlrpc-c-no-curltypes-incl.patch | 30 ++++++++++++++++++++++++++++++ xmlrpc-c.changes | 6 ++++++ xmlrpc-c.spec | 6 +++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 xmlrpc-c-no-curltypes-incl.patch diff --git a/xmlrpc-c-no-curltypes-incl.patch b/xmlrpc-c-no-curltypes-incl.patch new file mode 100644 index 0000000..24a8dbe --- /dev/null +++ b/xmlrpc-c-no-curltypes-incl.patch @@ -0,0 +1,30 @@ +--- lib/curl_transport/curlmulti.c.orig ++++ lib/curl_transport/curlmulti.c +@@ -19,7 +19,6 @@ + #endif + + #include +-#include + #include + #include + +--- lib/curl_transport/curltransaction.c.orig ++++ lib/curl_transport/curltransaction.c +@@ -17,7 +17,6 @@ + #include "version.h" + + #include +-#include + #include + + #include "curlversion.h" +--- lib/curl_transport/xmlrpc_curl_transport.c.orig ++++ lib/curl_transport/xmlrpc_curl_transport.c +@@ -85,7 +85,6 @@ + #include "xmlrpc-c/time_int.h" + + #include +-#include + #include + #include + diff --git a/xmlrpc-c.changes b/xmlrpc-c.changes index c7a6361..2fa46d5 100644 --- a/xmlrpc-c.changes +++ b/xmlrpc-c.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 21 15:09:55 UTC 2011 - rschweikert@suse.com + +- remove include of curl/types.h; file no longer exists and has been + empty for a while + ------------------------------------------------------------------- Tue Jun 28 22:08:44 UTC 2011 - appleonkel@opensuse.org diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec index 9d223d7..3b82fe9 100644 --- a/xmlrpc-c.spec +++ b/xmlrpc-c.spec @@ -28,8 +28,9 @@ License: BSD Group: Development/Libraries/C and C++ URL: http://xmlrpc-c.sourceforge.net # http://prdownloads.sourceforge.net/xmlrpc-c/xmlrpc-c-%{version}.tgz -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-default-constructor.patch +Patch1: %{name}-no-curltypes-incl.patch Source99: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf automake file gcc-c++ libtool @@ -263,6 +264,9 @@ Authors: %prep %setup -q %patch0 +%if 0%{?suse_version} >= 1040 +%patch1 +%endif %__rm -rf examples/.cvsignore examples/cpp/.cvsignore