Author: glen Date: Sat Dec 5 22:19:19 2009 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.20.3 from fedora
---- Files affected: packages/xmlrpc-c: xmlrpc-c-cflags.patch (1.2 -> 1.3) , xmlrpc-c-soname.patch (1.8 -> 1.9) , xmlrpc-c.spec (1.29 -> 1.30) , xmlrpc-c-cmake.patch (NONE -> 1.1) (NEW), xmlrpc-c-longlong.patch (NONE -> 1.1) (NEW), xmlrpc-c-printf-size_t.patch (NONE -> 1.1) (NEW), xmlrpc-c-uninit-curl.patch (NONE -> 1.1) (NEW), xmlrpc-c-va_list.patch (NONE -> 1.1) (NEW), xmlrpc-c-verbose-curl.patch (NONE -> 1.1) (NEW), xmlrpc-c-fixed-broken-format-string-modifiers-for-size_t-type.patch (1.1 -> NONE) (REMOVED), xmlrpc-c-use-proper-datatypes.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/xmlrpc-c/xmlrpc-c-cflags.patch diff -u packages/xmlrpc-c/xmlrpc-c-cflags.patch:1.2 packages/xmlrpc-c/xmlrpc-c-cflags.patch:1.3 --- packages/xmlrpc-c/xmlrpc-c-cflags.patch:1.2 Wed Apr 11 09:10:17 2007 +++ packages/xmlrpc-c/xmlrpc-c-cflags.patch Sat Dec 5 23:19:14 2009 @@ -1,6 +1,5 @@ -diff -urN xmlrpc-c-1.10.00.org/Makefile.common xmlrpc-c-1.10.00/Makefile.common ---- xmlrpc-c-1.10.00.org/Makefile.common 2007-03-23 03:02:14.000000000 +0100 -+++ xmlrpc-c-1.10.00/Makefile.common 2007-04-11 09:05:10.452171013 +0200 +--- xmlrpc-c-1.10.00.org/common.mk 2007-03-23 03:02:14.000000000 +0100 ++++ xmlrpc-c-1.10.00/common.mk 2007-04-11 09:05:10.452171013 +0200 @@ -28,15 +28,15 @@ # assertion and crash the program if it isn't really true. You can add # -UNDEBUG (in any of various ways) to override this. ================================================================ Index: packages/xmlrpc-c/xmlrpc-c-soname.patch diff -u packages/xmlrpc-c/xmlrpc-c-soname.patch:1.8 packages/xmlrpc-c/xmlrpc-c-soname.patch:1.9 --- packages/xmlrpc-c/xmlrpc-c-soname.patch:1.8 Sun Jul 20 00:18:06 2008 +++ packages/xmlrpc-c/xmlrpc-c-soname.patch Sat Dec 5 23:19:14 2009 @@ -1,5 +1,5 @@ ---- xmlrpc-c-1.14.2/src/Makefile.orig 2008-04-18 18:22:02.000000000 +0200 -+++ xmlrpc-c-1.14.2/src/Makefile 2008-07-20 00:02:46.000000000 +0200 +--- xmlrpc-c-1.20.3/src/Makefile~ 2009-10-03 03:58:24.000000000 +0000 ++++ xmlrpc-c-1.20.3/src/Makefile 2009-12-05 21:20:45.038553497 +0000 @@ -15,7 +15,7 @@ SUBDIRS += cpp endif @@ -9,7 +9,7 @@ # We cannot build libxmlrpc_server_abyss if we can't also build Abyss, # because we need libxmlrpc_abyss in order to build the proper runtime -@@ -141,7 +141,7 @@ +@@ -148,7 +148,7 @@ # shlibfn generates e.g. libxmlrpc.so.3.1 # shliblefn generates e.g. libxmlrpc.so @@ -18,7 +18,7 @@ $(LIBXMLRPC): $(LIBXMLRPC_MODS:%=%.osh) \ $(LIBXMLRPC_UTIL) \ -@@ -156,10 +156,10 @@ +@@ -163,10 +163,10 @@ $(LIBXMLRPC_SERVER): \ $(LIBXMLRPC_SERVER_MODS:%=%.osh) \ $(LIBXMLRPC_UTIL) \ @@ -26,12 +26,12 @@ + $(call shliblefn, libxmlrpc-c) $(LIBXMLRPC_SERVER): LIBOBJECTS = $(LIBXMLRPC_SERVER_MODS:%=%.osh) $(LIBXMLRPC_SERVER): LIBDEP = \ -- -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -L. -lxmlrpc -+ -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -L. -lxmlrpc-c +- -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util ++ -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util LIBXMLRPC_SERVER_ABYSS = $(call shlibfn, libxmlrpc_server_abyss) -@@ -168,13 +168,13 @@ +@@ -175,12 +175,12 @@ $(LIBXMLRPC_UTIL) \ $(LIBXMLRPC_ABYSS) \ $(call shliblefn, libxmlrpc_server) \ @@ -39,15 +39,14 @@ + $(call shliblefn, libxmlrpc-c) $(LIBXMLRPC_SERVER_ABYSS): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSS_MODS:%=%.osh) $(LIBXMLRPC_SERVER_ABYSS): LIBDEP = \ - -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \ -L. -lxmlrpc_server \ -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \ -- -lxmlrpc -+ -lxmlrpc-c +- -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util ++ -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util LIBXMLRPC_SERVER_CGI = $(call shlibfn, libxmlrpc_server_cgi) -@@ -182,10 +182,10 @@ +@@ -188,11 +188,11 @@ $(LIBXMLRPC_SERVER_CGI_MODS:%=%.osh) \ $(LIBXMRPC_UTIL) \ $(call shliblefn, libxmlrpc_server) \ @@ -55,12 +54,13 @@ + $(call shliblefn, libxmlrpc-c) $(LIBXMLRPC_SERVER_CGI): LIBOBJECTS = $(LIBXMLRPC_SERVER_CGI_MODS:%=%.osh) $(LIBXMLRPC_SERVER_CGI): LIBDEP = \ -- -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -L. -lxmlrpc_server -lxmlrpc -+ -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -L. -lxmlrpc_server -lxmlrpc-c + -L. -lxmlrpc_server \ +- -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util ++ -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util LIBXMLRPC_CLIENT = $(call shlibfn, libxmlrpc_client) -@@ -193,18 +193,18 @@ +@@ -200,16 +200,16 @@ $(LIBXMLRPC_CLIENT_MODS:%=%.osh) \ $(TRANSPORT_MODS:%=%.osh) \ $(LIBXMLRPC_UTIL) \ @@ -70,11 +70,9 @@ $(LIBXMLRPC_CLIENT_MODS:%=%.osh) \ $(TRANSPORT_MODS:%=%.osh) $(LIBXMLRPC_CLIENT): LIBDEP = \ - -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \ -- -L. -lxmlrpc \ -+ -L. -lxmlrpc-c \ - $(TRANSPORT_LIBDEP) - + $(TRANSPORT_LIBDEP) \ +- -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util ++ -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util -libxmlrpc.a: $(LIBXMLRPC_MODS:%=%.o) -libxmlrpc.a: LIBOBJECTS = $(LIBXMLRPC_MODS:%=%.o) @@ -83,8 +81,8 @@ libxmlrpc_server.a: $(LIBXMLRPC_SERVER_MODS:%=%.o) libxmlrpc_server.a: LIBOBJECTS = $(LIBXMLRPC_SERVER_MODS:%=%.o) ---- xmlrpc-c-1.14.2/tools/Makefile.common.orig 2008-03-27 19:17:42.000000000 +0100 -+++ xmlrpc-c-1.14.2/tools/Makefile.common 2008-05-14 18:01:21.855674904 +0200 +--- xmlrpc-c-1.14.2/tools/common.mk 2008-03-27 19:17:42.000000000 +0100 ++++ xmlrpc-c-1.14.2/tools/common.mk 2008-05-14 18:01:21.855674904 +0200 @@ -11,7 +11,7 @@ CLIENT_LDLIBS = -L$(BLDDIR)/src -L$(BLDDIR)/lib/libutil @@ -94,8 +92,8 @@ ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes) CLIENT_LDLIBS += $(shell libwww-config --libs) ---- xmlrpc-c-1.14.2/Makefile.common.orig 2008-05-14 17:43:31.882708000 +0200 -+++ xmlrpc-c-1.14.2/Makefile.common 2008-05-14 17:59:12.072278970 +0200 +--- xmlrpc-c-1.14.2/common.mk 2008-05-14 17:43:31.882708000 +0200 ++++ xmlrpc-c-1.14.2/common.mk 2008-05-14 17:59:12.072278970 +0200 @@ -142,7 +142,7 @@ ifneq ($(OMIT_XMLRPC_LIB_RULE),Y) @@ -125,32 +123,150 @@ the_rpath="-R$LIBINST_DIR $the_rpath" the_wl_rpath="-Wl,-rpath,$LIBINST_DIR $the_wl_rpath" ---- xmlrpc-c-1.14.2/src/cpp/Makefile.orig 2008-03-27 19:17:42.000000000 +0100 -+++ xmlrpc-c-1.14.2/src/cpp/Makefile 2008-05-14 18:23:45.688255558 +0200 -@@ -114,7 +114,7 @@ - $(LIBXMLRPCPP): $(LIBXMLRPCPP_MODS:%=%.osh) \ - $(LIBXMLRPC) - $(LIBXMLRPCPP): LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.osh) --$(LIBXMLRPCPP): LIBDEP = -Lblddir/src -lxmlrpc -+$(LIBXMLRPCPP): LIBDEP = -Lblddir/src -lxmlrpc-c - - LIBXMLRPC_SERVERPP = $(call shlibfn, libxmlrpc_server++) - -@@ -122,7 +122,7 @@ - $(LIBXMLRPC_SERVER) \ - $(LIBXMLRPC) - $(LIBXMLRPC_SERVERPP): LIBOBJECTS = $(LIBXMLRPC_SERVERPP_MODS:%=%.osh) --$(LIBXMLRPC_SERVERPP): LIBDEP = -Lblddir/src -lxmlrpc_server -lxmlrpc -+$(LIBXMLRPC_SERVERPP): LIBDEP = -Lblddir/src -lxmlrpc_server -lxmlrpc-c - - LIBXMLRPC_SERVER_ABYSSPP = $(call shlibfn, libxmlrpc_server_abyss++) - -@@ -131,7 +131,7 @@ - $(LIBXMLRPC) - $(LIBXMLRPC_SERVER_ABYSSPP): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh) - $(LIBXMLRPC_SERVER_ABYSSPP): LIBDEP = \ -- -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss -Lblddir/src -lxmlrpc -+ -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss -Lblddir/src -lxmlrpc-c +--- xmlrpc-c-1.20.3/src/cpp/Makefile~ 2009-07-01 17:39:59.000000000 +0000 ++++ xmlrpc-c-1.20.3/src/cpp/Makefile 2009-12-05 21:25:08.455609267 +0000 +@@ -127,7 +127,7 @@ + $(LIBXMLRPC_UTIL) + $(LIBXMLRPC_CPP_SH): LIBOBJECTS = XmlRpcCpp.osh + $(LIBXMLRPC_CPP_SH): LIBDEP = \ +- -Lblddir/src -lxmlrpc_server -lxmlrpc \ ++ -Lblddir/src -lxmlrpc_server -lxmlrpc-c \ + $(XML_PARSER_LIBDEP) \ + -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util + +@@ -138,7 +138,7 @@ + $(LIBXMLRPC_UTIL) + $(LIBXMLRPCPP_SH): LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.osh) + $(LIBXMLRPCPP_SH): LIBDEP = \ +- -Lblddir/src -lxmlrpc \ ++ -Lblddir/src -lxmlrpc-c \ + $(XML_PARSER_LIBDEP) \ + -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util + +@@ -153,7 +153,7 @@ + $(LIBXMLRPC_SERVERPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVERPP_MODS:%=%.osh) + $(LIBXMLRPC_SERVERPP_SH): LIBDEP = \ + -L. -l$(LIBXMLRPCPP_NAME) \ +- -Lblddir/src -lxmlrpc_server -lxmlrpc \ ++ -Lblddir/src -lxmlrpc_server -lxmlrpc-c \ + $(XML_PARSER_LIBDEP) \ + -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util + +@@ -169,7 +169,7 @@ + $(LIBXMLRPC_SERVER_ABYSSPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh) + $(LIBXMLRPC_SERVER_ABYSSPP_SH): LIBDEP = \ + -L. -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) \ +- -Lblddir/src -lxmlrpc_server_abyss -lxmlrpc_server -lxmlrpc \ ++ -Lblddir/src -lxmlrpc_server_abyss -lxmlrpc_server -lxmlrpc-c \ + $(XML_PARSER_LIBDEP) \ + -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \ + -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \ +@@ -183,7 +183,7 @@ + $(LIBXMLRPC_SERVER_CGIPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh) + $(LIBXMLRPC_SERVER_CGIPP_SH): LIBDEP = \ + -L. -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) \ +- -Lblddir/src -lxmlrpc_server -lxmlrpc \ ++ -Lblddir/src -lxmlrpc_server -lxmlrpc-c \ + $(XML_PARSER_LIBDEP) \ + -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util + +@@ -197,7 +197,7 @@ + $(LIBXMLRPC_SERVER_PSTREAMPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_PSTREAMPP_MODS:%=%.osh) + $(LIBXMLRPC_SERVER_PSTREAMPP_SH): LIBDEP = \ + -L. -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) -lxmlrpc_packetsocket \ +- -Lblddir/src -lxmlrpc_server -lxmlrpc \ ++ -Lblddir/src -lxmlrpc_server -lxmlrpc-c \ + $(XML_PARSER_LIBDEP) \ + -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \ - LIBXMLRPC_SERVER_PSTREAMPP = $(call shlibfn, libxmlrpc_server_pstream++) +@@ -212,7 +212,7 @@ + $(LIBXMLRPC_CLIENTPP_SH): LIBOBJECTS = $(LIBXMLRPC_CLIENTPP_MODS:%=%.osh) + $(LIBXMLRPC_CLIENTPP_SH): LIBDEP = \ + -L. -l$(LIBXMLRPCPP_NAME) -lxmlrpc_packetsocket \ +- -Lblddir/src -lxmlrpc_client -lxmlrpc \ ++ -Lblddir/src -lxmlrpc_client -lxmlrpc-c \ + $(XML_PARSER_LIBDEP) \ + -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util + +@@ -223,7 +223,7 @@ + $(LIBXMLRPC_PACKETSOCKET_SH): LIBOBJECTS = $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh) + $(LIBXMLRPC_PACKETSOCKET_SH): LIBDEP = \ + -L. -l$(LIBXMLRPCPP_NAME) \ +- -Lblddir/src -lxmlrpc \ ++ -Lblddir/src -lxmlrpc-c \ + $(XML_PARSER_LIBDEP) \ + -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util + +--- xmlrpc-c-1.20.3/src/xmlrpc.pc.cmake~ 2009-12-05 22:00:03.000000000 +0000 ++++ xmlrpc-c-1.20.3/src/xmlrpc.pc.cmake 2009-12-05 22:00:41.931645906 +0000 +@@ -8,5 +8,5 @@ + Version: @XMLRPC_C_VERSION@ + + Requires.private: @xmlrpc_pkgconfig_req@ xmlrpc_util +-Libs: -L${libdir} -lxmlrpc @xmlrpc_pkgconfig_libs@ ++Libs: -L${libdir} -lxmlrpc-c @xmlrpc_pkgconfig_libs@ + Cflags: -I${includedir} +--- xmlrpc-c-1.20.3/src/CMakeLists.txt 2009-12-05 22:06:26.335153315 +0000 ++++ xmlrpc-c-1.20.3/src/CMakeLists.txt 2009-12-05 22:09:49.944925301 +0000 +@@ -51,8 +51,8 @@ + + + +-### libxmlrpc.so +-add_library(xmlrpc SHARED ++### libxmlrpc-c.so ++add_library(xmlrpc-c SHARED + double.c parse_datetime.c parse_value.c resource.c trace.c version.c + ${xmlrpc_xml_parser} + xmlrpc_data.c xmlrpc_datetime.c xmlrpc_string.c +@@ -60,19 +60,19 @@ + xmlrpc_build.c xmlrpc_decompose.c xmlrpc_parse.c xmlrpc_serialize.c + xmlrpc_base64.c xmlrpc_authcookie.c) + +-set_target_properties(xmlrpc ++set_target_properties(xmlrpc-c + PROPERTIES + COMPILE_FLAGS ${libxml_INCLUDES}) + + ensc_pkgconfig(xmlrpc) +-target_link_libraries(xmlrpc ${libxml_LIBS} xmlrpc_util) +-list(APPEND lib_TARGETS xmlrpc) ++target_link_libraries(xmlrpc-c ${libxml_LIBS} xmlrpc_util) ++list(APPEND lib_TARGETS xmlrpc-c) + + ### libxmlrpc_client.so + add_library(xmlrpc_client SHARED + xmlrpc_client.c xmlrpc_client_global.c xmlrpc_server_info.c ${transport_SOURCES}) + +-target_link_libraries(xmlrpc_client xmlrpc ${client_LIBS}) ++target_link_libraries(xmlrpc_client xmlrpc-c ${client_LIBS}) + set_target_properties(xmlrpc_client + PROPERTIES + COMPILE_FLAGS "${client_CFLAGS}") +@@ -82,7 +82,7 @@ + ### libxmlrpc_server.so + add_library(xmlrpc_server SHARED + registry.c method.c system_method.c) +-target_link_libraries(xmlrpc_server xmlrpc) ++target_link_libraries(xmlrpc_server xmlrpc-c) + list(APPEND lib_TARGETS xmlrpc_server) + ensc_pkgconfig(xmlrpc_server) + +--- xmlrpc-c-1.20.3/src/cpp/CMakeLists.txt~ 2009-12-05 22:10:18.000000000 +0000 ++++ xmlrpc-c-1.20.3/src/cpp/CMakeLists.txt 2009-12-05 22:13:43.182401300 +0000 +@@ -4,13 +4,13 @@ + add_library(xmlrpc++ SHARED + base64.cpp env_wrap.cpp fault.cpp girerr.cpp girmem.cpp + outcome.cpp param_list.cpp value.cpp xml.cpp) +-target_link_libraries(xmlrpc++ xmlrpc) ++target_link_libraries(xmlrpc++ xmlrpc-c) + list(APPEND lib_TARGETS xmlrpc++) + ensc_pkgconfig(xmlrpc++) + + ####### libxmlrpc_cpp.so + add_library(xmlrpc_cpp SHARED XmlRpcCpp) +-target_link_libraries(xmlrpc_cpp xmlrpc xmlrpc_server xmlrpc_client) ++target_link_libraries(xmlrpc_cpp xmlrpc-c xmlrpc_server xmlrpc_client) + list(APPEND lib_TARGETS xmlrpc_cpp) + ensc_pkgconfig(xmlrpc_cpp) ================================================================ Index: packages/xmlrpc-c/xmlrpc-c.spec diff -u packages/xmlrpc-c/xmlrpc-c.spec:1.29 packages/xmlrpc-c/xmlrpc-c.spec:1.30 --- packages/xmlrpc-c/xmlrpc-c.spec:1.29 Mon Jul 6 12:31:09 2009 +++ packages/xmlrpc-c/xmlrpc-c.spec Sat Dec 5 23:19:14 2009 @@ -1,21 +1,35 @@ # $Revision$, $Date$ +# TODO +# - sync -pl + +# Conditional build: +%bcond_with static_libs # don't build static libraries + Summary: XML-RPC C library - an implementation of the xmlrpc protocol Summary(pl.UTF-8): Biblioteka XML-RPC C - implementacja protokołu xmlrpc Name: xmlrpc-c -Version: 1.14.2 -Release: 3 +Version: 1.20.3 +Release: 1 License: XML-RPC for C License (BSD-like) Group: Libraries +# generated by 'make svn-sources [SVN_VER=%version SVN_REV=%svnrev]'. Unfortunately, +# upstream does not tag versions so we must fetch from the branch and +# check which version was used for it Source0: %{name}-%{version}.tar.bz2 -# Source0-md5: cbd9675dc48819d5f745b775fca7d425 +# Source0-md5: d987c3d989ca1a4774ce12fada437238 Patch0: %{name}-fastdep.patch Patch1: %{name}-soname.patch Patch2: %{name}-cflags.patch -Patch3: %{name}-fixed-broken-format-string-modifiers-for-size_t-type.patch -Patch4: %{name}-use-proper-datatypes.patch +Patch3: %{name}-cmake.patch +Patch4: %{name}-longlong.patch +Patch5: %{name}-printf-size_t.patch +Patch6: %{name}-uninit-curl.patch +Patch7: %{name}-va_list.patch +Patch8: %{name}-verbose-curl.patch URL: http://xmlrpc-c.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: cmake BuildRequires: curl-devel BuildRequires: libstdc++-devel BuildRequires: libtool @@ -24,11 +38,67 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -XML-RPC C library - an implementation of the xmlrpc protocol. +XML-RPC is a quick-and-easy way to make procedure calls over the +Internet. It converts the procedure call into XML document, sends it +to a remote server using HTTP, and gets back the response as XML. + +This library provides a modular implementation of XML-RPC for C. %description -l pl.UTF-8 Biblioteka XML-RPC C - implementacja protokołu xmlrpc. +%package c++ +Summary: C++ libraries for xmlrpc-c +Group: Libraries +Requires: %{name} = %{version}-%{release} +Conflicts: xmlrpc-c < 1.20.3-1 + +%description c++ +XML-RPC is a quick-and-easy way to make procedure calls over the +Internet. It converts the procedure call into XML document, sends it +to a remote server using HTTP, and gets back the response as XML. + +This library provides a modular implementation of XML-RPC for C++. + +%package client +Summary: C client libraries for xmlrpc-c +Group: Libraries +Requires: %{name} = %{version}-%{release} +Conflicts: xmlrpc-c < 1.20.3-1 + +%description client +XML-RPC is a quick-and-easy way to make procedure calls over the +Internet. It converts the procedure call into XML document, sends it +to a remote server using HTTP, and gets back the response as XML. + +This library provides a modular implementation of XML-RPC for C +clients. + +%package client++ +Summary: C++ client libraries for xmlrpc-c +Group: Libraries +Requires: %{name} = %{version}-%{release} +Conflicts: xmlrpc-c < 1.20.3-1 + +%description client++ +XML-RPC is a quick-and-easy way to make procedure calls over the +Internet. It converts the procedure call into XML document, sends it +to a remote server using HTTP, and gets back the response as XML. + +This library provides a modular implementation of XML-RPC for C++ +clients. + +%package apps +Summary: Sample XML-RPC applications +Group: Applications/Networking + +%description apps +XML-RPC is a quick-and-easy way to make procedure calls over the +Internet. It converts the procedure call into XML document, sends it +to a remote server using HTTP, and gets back the response as XML. + +This package contains some handy XML-RPC demo applications. + %package devel Summary: Header files etc to develop XML-RPC applications Summary(pl.UTF-8): Pliki nagłówkowe do tworzenia aplikacji XML-RPC @@ -61,56 +131,66 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch1 -p1 + +## not needed... +rm doc/{INSTALL,configure_doc} %build -%{__libtoolize} -# hack: libtoolize removes config.* here -cp -f /usr/share/automake/{missing,config.*} . -%{__aclocal} -%{__autoconf} -%configure \ - --enable-abyss-server \ - --enable-cgi-server \ - --enable-cplusplus \ - --enable-libxml2-backend \ - --enable-curl-client \ - --enable-libwww-client \ - --with-libwww-ssl \ - --enable-abyss-threads +mkdir -p build +cd build +%cmake .. \ + -D_lib:STRING=%{_lib} \ + -DMUST_BUILD_CURL_CLIENT:BOOL=ON \ + -DMUST_BUILD_LIBWWW_CLIENT:BOOL=OFF \ + -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DENABLE_TOOLS:BOOL=ON -%{__make} -j1 \ - CFLAGS_PERSONAL="%{rpmcflags}" +%{__make} VERBOSE=1 %install rm -rf $RPM_BUILD_ROOT -%{__make} -j1 install \ +%{__make} -C build install \ DESTDIR=$RPM_BUILD_ROOT \ - LIBINST_DIR=%{_libdir} + +chmod +x $RPM_BUILD_ROOT%{_libdir}/*.so rm $RPM_BUILD_ROOT%{_includedir}/xmlrpc_server_w32httpsys.h \ $RPM_BUILD_ROOT%{_includedir}/xmlrpc-c/server_w32httpsys.h +rm $RPM_BUILD_ROOT%{_bindir}/xml-rpc-api2txt + %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post client -p /sbin/ldconfig +%postun client -p /sbin/ldconfig + +%post c++ -p /sbin/ldconfig +%postun c++ -p /sbin/ldconfig + +%post client++ -p /sbin/ldconfig +%postun client++ -p /sbin/ldconfig + %files %defattr(644,root,root,755) %doc README doc/{COPYING,CREDITS,HISTORY,SECURITY,TODO} -# C %attr(755,root,root) %{_libdir}/libxmlrpc-c.so.*.* %attr(755,root,root) %ghost %{_libdir}/libxmlrpc-c.so.3 %attr(755,root,root) %{_libdir}/libxmlrpc_abyss.so.*.* %attr(755,root,root) %ghost %{_libdir}/libxmlrpc_abyss.so.3 -%attr(755,root,root) %{_libdir}/libxmlrpc_client.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_client.so.3 %attr(755,root,root) %{_libdir}/libxmlrpc_server.so.*.* %attr(755,root,root) %ghost %{_libdir}/libxmlrpc_server.so.3 %attr(755,root,root) %{_libdir}/libxmlrpc_server_abyss.so.*.* @@ -119,21 +199,43 @@ %attr(755,root,root) %ghost %{_libdir}/libxmlrpc_server_cgi.so.3 %attr(755,root,root) %{_libdir}/libxmlrpc_util.so.*.* %attr(755,root,root) %ghost %{_libdir}/libxmlrpc_util.so.3 -# C++ + +%files client +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libxmlrpc_client.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_client.so.3 + +%files c++ +%defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libxmlrpc++.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libxmlrpc++.so.4 -%attr(755,root,root) %{_libdir}/libxmlrpc_client++.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_client++.so.4 +%attr(755,root,root) %ghost %{_libdir}/libxmlrpc++.so.6 %attr(755,root,root) %{_libdir}/libxmlrpc_cpp.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_cpp.so.4 +%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_cpp.so.6 %attr(755,root,root) %{_libdir}/libxmlrpc_packetsocket.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_packetsocket.so.4 +%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_packetsocket.so.6 %attr(755,root,root) %{_libdir}/libxmlrpc_server++.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_server++.so.4 +%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_server++.so.6 %attr(755,root,root) %{_libdir}/libxmlrpc_server_abyss++.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_server_abyss++.so.4 +%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_server_abyss++.so.6 +%attr(755,root,root) %{_libdir}/libxmlrpc_server_cgi++.so.6.20 +%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_server_cgi++.so.6 %attr(755,root,root) %{_libdir}/libxmlrpc_server_pstream++.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_server_pstream++.so.4 +%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_server_pstream++.so.6 + +%files client++ +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libxmlrpc_client++.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_client++.so.6 + +%files apps +%defattr(644,root,root,755) +%doc tools/xmlrpc/xmlrpc.html +%doc tools/xmlrpc_transport/xmlrpc_transport.html +%{_mandir}/man1/* +%attr(755,root,root) %{_bindir}/xmlrpc +%attr(755,root,root) %{_bindir}/xmlrpc_transport +%attr(755,root,root) %{_bindir}/xml-rpc-api2cpp +%attr(755,root,root) %{_bindir}/xmlrpc_cpp_proxy %files devel %defattr(644,root,root,755) @@ -147,22 +249,40 @@ %attr(755,root,root) %{_libdir}/libxmlrpc_server_abyss.so %attr(755,root,root) %{_libdir}/libxmlrpc_server_cgi.so %attr(755,root,root) %{_libdir}/libxmlrpc_util.so +%{_pkgconfigdir}/xmlrpc.pc +%{_pkgconfigdir}/xmlrpc_abyss.pc +%{_pkgconfigdir}/xmlrpc_client.pc +%{_pkgconfigdir}/xmlrpc_cpp.pc +%{_pkgconfigdir}/xmlrpc_packetsocket.pc +%{_pkgconfigdir}/xmlrpc_server.pc +%{_pkgconfigdir}/xmlrpc_server_abyss.pc +%{_pkgconfigdir}/xmlrpc_server_cgi.pc +%{_pkgconfigdir}/xmlrpc_util.pc %dir %{_includedir}/xmlrpc-c %{_includedir}/xmlrpc-c/*.h # legacy %{_includedir}/xmlrpc*.h # C++ -%attr(755,root,root) %{_libdir}/libxmlrpc++.so %attr(755,root,root) %{_libdir}/libxmlrpc_client++.so %attr(755,root,root) %{_libdir}/libxmlrpc_cpp.so %attr(755,root,root) %{_libdir}/libxmlrpc_packetsocket.so -%attr(755,root,root) %{_libdir}/libxmlrpc_server++.so %attr(755,root,root) %{_libdir}/libxmlrpc_server_abyss++.so +%attr(755,root,root) %{_libdir}/libxmlrpc_server_cgi++.so %attr(755,root,root) %{_libdir}/libxmlrpc_server_pstream++.so +%attr(755,root,root) %{_libdir}/libxmlrpc_server++.so +%attr(755,root,root) %{_libdir}/libxmlrpc++.so <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xmlrpc-c/xmlrpc-c-cflags.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xmlrpc-c/xmlrpc-c-soname.patch?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xmlrpc-c/xmlrpc-c.spec?r1=1.29&r2=1.30&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit