diff --git a/narrowing.patch b/narrowing.patch deleted file mode 100644 index f9c117a..0000000 --- a/narrowing.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xmlrpc-c-1.33.18/src/cpp/base64.cpp -=================================================================== ---- xmlrpc-c-1.33.18.orig/src/cpp/base64.cpp -+++ xmlrpc-c-1.33.18/src/cpp/base64.cpp -@@ -14,7 +14,7 @@ using namespace xmlrpc_c; - - namespace { - --char const table_a2b_base64[] = { -+signed char const table_a2b_base64[] = { - -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, - -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63, diff --git a/xmlrpc-c-1.33.18.tgz b/xmlrpc-c-1.33.18.tgz deleted file mode 100644 index 765c9b0..0000000 --- a/xmlrpc-c-1.33.18.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6cbddfa41f9b603af46b839a644d10b39e926e57a7a8682bcb85964e717074b2 -size 804669 diff --git a/xmlrpc-c-1.39.12.tgz b/xmlrpc-c-1.39.12.tgz new file mode 100644 index 0000000..1f21e3c --- /dev/null +++ b/xmlrpc-c-1.39.12.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d830f3264a832dfe09f629cc64036acfd08121692526d0fabe090f7ff881ce08 +size 816428 diff --git a/xmlrpc-c-no_return_nonvoid.patch b/xmlrpc-c-no_return_nonvoid.patch new file mode 100644 index 0000000..d42e52f --- /dev/null +++ b/xmlrpc-c-no_return_nonvoid.patch @@ -0,0 +1,12 @@ +Index: lib/abyss++/AbyssServer.cpp +=================================================================== +--- lib/abyss++/AbyssServer.cpp.orig ++++ lib/abyss++/AbyssServer.cpp +@@ -300,6 +300,7 @@ AbyssServer::Session::method() const { + case m_trace: return METHOD_TRACE; + case m_options: return METHOD_OPTIONS; + } ++ return METHOD_UNKNOWN; + } + + diff --git a/xmlrpc-c.changes b/xmlrpc-c.changes index 7370d34..45749e0 100644 --- a/xmlrpc-c.changes +++ b/xmlrpc-c.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Mar 24 17:48:14 UTC 2017 - mpluskal@suse.com + +- Update to version 1.39.12: + * For full list of changes see: + http://xmlrpc-c.sourceforge.net/change_super_stable.html +- Drop upstreamed narrowing.patch +- Add xmlrpc-c-no_return_nonvoid.patch + ------------------------------------------------------------------- Wed Jul 27 10:16:05 UTC 2016 - schwab@suse.de @@ -6,7 +15,7 @@ Wed Jul 27 10:16:05 UTC 2016 - schwab@suse.de ------------------------------------------------------------------- Tue Nov 17 12:20:54 UTC 2015 - mpluskal@suse.com -- Update to 1.3.18 +- Update to 1.33.18 * Fix bug: infinite recursion if you try to format a floating point value that was created from something other than a finite number. Creation of a floating point XML-RPC value from diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec index 1d84695..43be7f0 100644 --- a/xmlrpc-c.spec +++ b/xmlrpc-c.spec @@ -1,7 +1,7 @@ # # spec file for package xmlrpc-c # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,25 +19,23 @@ %define soname 3 %define soname_cpp 8 Name: xmlrpc-c -Version: 1.33.18 +Version: 1.39.12 Release: 0 Summary: Library implementing XML-based Remote Procedure Calls License: BSD-3-Clause and MIT Group: Development/Libraries/C and C++ Url: http://xmlrpc-c.sourceforge.net/ -#SVN-Clone: http://svn.code.sf.net/p/xmlrpc-c/code/stable/ -#Snapshot: r2540 -Source: http://sourceforge.net/projects/xmlrpc-c/files/Xmlrpc-c%20Super%20Stable/%{version}/%{name}-%{version}.tgz -Patch: narrowing.patch +Source: http://sourceforge.net/projects/xmlrpc-c/files/Xmlrpc-c%%20Super%%20Stable/%{version}/%{name}-%{version}.tgz +Patch0: xmlrpc-c-no_return_nonvoid.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ -BuildRequires: libcurl-devel -BuildRequires: libxml2-devel BuildRequires: makeinfo BuildRequires: ncurses-devel +BuildRequires: pkgconfig BuildRequires: readline-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libxml-2.0) %description XML-RPC is a lightweight RPC protocol based on XML and HTTP. This @@ -46,10 +44,10 @@ package is used by XML-RPC clients and servers written in C and C++. %package devel Summary: Development package for xmlrpc-c Group: Development/Libraries/C and C++ -Requires: libxml2-devel Requires: libxmlrpc%{soname} = %{version} Requires: libxmlrpc++%{soname_cpp} = %{version} Requires: libxmlrpc_abyss%{soname} = %{version} +Requires: libxmlrpc_abyss++%{soname_cpp} = %{version} Requires: libxmlrpc_client%{soname} = %{version} Requires: libxmlrpc_client++%{soname_cpp} = %{version} Requires: libxmlrpc_cpp%{soname_cpp} = %{version} @@ -62,9 +60,8 @@ Requires: libxmlrpc_server_cgi%{soname} = %{version} Requires: libxmlrpc_server_cgi++%{soname_cpp} = %{version} Requires: libxmlrpc_server_pstream++%{soname_cpp} = %{version} Requires: libxmlrpc_util%{soname} = %{version} -# libxmlrpc-c-devel was last used in version 1.25.07 -Provides: libxmlrpc-c-devel = %{version} -Obsoletes: libxmlrpc-c-devel < %{version} +Requires: libxmlrpc_util++%{soname_cpp} = %{version} +Requires: pkgconfig(libxml-2.0) %description devel XML-RPC is a lightweight RPC protocol based on XML and HTTP. This @@ -97,6 +94,14 @@ Group: System/Libraries XML-RPC is a lightweight RPC protocol based on XML and HTTP. This package is used by XML-RPC clients and servers written in C and C++. +%package -n libxmlrpc_abyss++%{soname_cpp} +Summary: Library implementing XML-based Remote Procedure Calls +Group: System/Libraries + +%description -n libxmlrpc_abyss++%{soname_cpp} +XML-RPC is a lightweight RPC protocol based on XML and HTTP. This +package is used by XML-RPC clients and servers written in C and C++. + %package -n libxmlrpc_client%{soname} Summary: Library implementing XML-based Remote Procedure Calls Group: System/Libraries @@ -193,9 +198,17 @@ Group: System/Libraries XML-RPC is a lightweight RPC protocol based on XML and HTTP. This package is used by XML-RPC clients and servers written in C and C++. +%package -n libxmlrpc_util++%{soname_cpp} +Summary: Library implementing XML-based Remote Procedure Calls +Group: System/Libraries + +%description -n libxmlrpc_util++%{soname_cpp} +XML-RPC is a lightweight RPC protocol based on XML and HTTP. This +package is used by XML-RPC clients and servers written in C and C++. + %prep -%setup -q -%patch -p1 +%setup -q +%patch0 %build export CFLAGS_PERSONAL="%{optflags}" @@ -207,7 +220,7 @@ make CADD="-fPIC -DPIC" AR=ar RANLIB=ranlib --jobs 1 make check CADD="-fPIC -DPIC" AR=ar RANLIB=ranlib --jobs 1 %install -make install DESTDIR=%{buildroot} AR=ar RANLIB=ranlib +%make_install AR=ar RANLIB=ranlib # Remove static libraries rm -f %{buildroot}%{_libdir}/*.a @@ -216,68 +229,43 @@ make -C examples clean make -C examples/cpp clean %post -n libxmlrpc%{soname} -p /sbin/ldconfig - %post -n libxmlrpc++%{soname_cpp} -p /sbin/ldconfig - %post -n libxmlrpc_abyss%{soname} -p /sbin/ldconfig - +%post -n libxmlrpc_abyss++%{soname_cpp} -p /sbin/ldconfig %post -n libxmlrpc_client%{soname} -p /sbin/ldconfig - %post -n libxmlrpc_client++%{soname_cpp} -p /sbin/ldconfig - %post -n libxmlrpc_cpp%{soname_cpp} -p /sbin/ldconfig - %post -n libxmlrpc_packetsocket%{soname_cpp} -p /sbin/ldconfig - %post -n libxmlrpc_server%{soname} -p /sbin/ldconfig - %post -n libxmlrpc_server++%{soname_cpp} -p /sbin/ldconfig - %post -n libxmlrpc_server_abyss%{soname} -p /sbin/ldconfig - %post -n libxmlrpc_server_abyss++%{soname_cpp} -p /sbin/ldconfig - %post -n libxmlrpc_server_cgi%{soname} -p /sbin/ldconfig - %post -n libxmlrpc_server_cgi++%{soname_cpp} -p /sbin/ldconfig - %post -n libxmlrpc_server_pstream++%{soname_cpp} -p /sbin/ldconfig - %post -n libxmlrpc_util%{soname} -p /sbin/ldconfig - +%post -n libxmlrpc_util++%{soname_cpp} -p /sbin/ldconfig %postun -n libxmlrpc%{soname} -p /sbin/ldconfig - %postun -n libxmlrpc++%{soname_cpp} -p /sbin/ldconfig - %postun -n libxmlrpc_abyss%{soname} -p /sbin/ldconfig - +%postun -n libxmlrpc_abyss++%{soname_cpp} -p /sbin/ldconfig %postun -n libxmlrpc_client%{soname} -p /sbin/ldconfig - %postun -n libxmlrpc_client++%{soname_cpp} -p /sbin/ldconfig - %postun -n libxmlrpc_cpp%{soname_cpp} -p /sbin/ldconfig - %postun -n libxmlrpc_packetsocket%{soname_cpp} -p /sbin/ldconfig - %postun -n libxmlrpc_server%{soname} -p /sbin/ldconfig - %postun -n libxmlrpc_server++%{soname_cpp} -p /sbin/ldconfig - %postun -n libxmlrpc_server_abyss%{soname} -p /sbin/ldconfig - %postun -n libxmlrpc_server_abyss++%{soname_cpp} -p /sbin/ldconfig - %postun -n libxmlrpc_server_cgi%{soname} -p /sbin/ldconfig - %postun -n libxmlrpc_server_cgi++%{soname_cpp} -p /sbin/ldconfig - %postun -n libxmlrpc_server_pstream++%{soname_cpp} -p /sbin/ldconfig - %postun -n libxmlrpc_util%{soname} -p /sbin/ldconfig +%postun -n libxmlrpc_util++%{soname_cpp} -p /sbin/ldconfig %files devel %defattr(-,root,root,-) -%doc examples/ +%doc examples/ %{_bindir}/xmlrpc-c-config %{_libdir}/*.so %{_includedir}/XmlRpcCpp.h @@ -295,6 +283,10 @@ make -C examples/cpp clean %defattr(-,root,root,-) %{_libdir}/libxmlrpc_abyss.so.%{soname}* +%files -n libxmlrpc_abyss++%{soname_cpp} +%defattr(-,root,root,-) +%{_libdir}/libxmlrpc_abyss++.so.%{soname_cpp}* + %files -n libxmlrpc_client%{soname} %defattr(-,root,root,-) %{_libdir}/libxmlrpc_client.so.%{soname}* @@ -343,4 +335,8 @@ make -C examples/cpp clean %defattr(-,root,root,-) %{_libdir}/libxmlrpc_util.so.%{soname}* +%files -n libxmlrpc_util++%{soname_cpp} +%defattr(-,root,root,-) +%{_libdir}/libxmlrpc_util++.so.%{soname_cpp}* + %changelog