rpms/xmlrpc-c/devel xmlrpc-c-1.04-libxml2.patch, NONE, 1.1 xmlrpc-c-1.04-namespace.patch, NONE, 1.1 xmlrpc-c.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Enrico Scholz (ensc) fedora-extras-commits at redhat.com
Sun Dec 18 18:16:04 UTC 2005


Author: ensc

Update of /cvs/extras/rpms/xmlrpc-c/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18677/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xmlrpc-c-1.04-libxml2.patch xmlrpc-c-1.04-namespace.patch 
	xmlrpc-c.spec 
Log Message:
auto-import xmlrpc-c-1.04-1 on branch devel from xmlrpc-c-1.04-1.src.rpm

xmlrpc-c-1.04-libxml2.patch:

--- NEW FILE xmlrpc-c-1.04-libxml2.patch ---
--- xmlrpc-c-1.04/src/xmlrpc_libxml2.c.builderr	2005-12-12 10:05:46.000000000 +0100
+++ xmlrpc-c-1.04/src/xmlrpc_libxml2.c	2005-12-12 10:11:57.000000000 +0100
@@ -147,7 +147,7 @@
 **  documentation on each function works.
 */
 
-char *xml_element_name (xml_element *elem)
+char const *xml_element_name (xml_element const * const elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return elem->_name;
@@ -167,13 +167,13 @@
     return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(char, &elem->_cdata);
 }
 
-size_t xml_element_children_size (xml_element *elem)
+size_t xml_element_children_size (xml_element const *elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return XMLRPC_TYPED_MEM_BLOCK_SIZE(xml_element*, &elem->_children);
 }
 
-xml_element **xml_element_children (xml_element *elem)
+xml_element **xml_element_children (xml_element const *elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(xml_element*, &elem->_children);
@@ -410,13 +410,13 @@
     XMLRPC_ASSERT(context.root != NULL);
     XMLRPC_ASSERT(context.current == NULL);
 
-    *resultP = context.root;
+    *resultPP = context.root;
 
  cleanup:
     if (parser)
         xmlFreeParserCtxt(parser);
 
-    if (env->fault_occurred) {
+    if (envP->fault_occurred) {
         if (context.root)
             xml_element_free(context.root);
     }

xmlrpc-c-1.04-namespace.patch:

--- NEW FILE xmlrpc-c-1.04-namespace.patch ---
--- xmlrpc-c-1.04/src/cpp/libwww.cpp.namespace	2005-11-10 03:24:26.000000000 +0100
+++ xmlrpc-c-1.04/src/cpp/libwww.cpp	2005-12-15 21:03:48.000000000 +0100
@@ -32,7 +32,7 @@
 using namespace xmlrpc_c;
 
 
-namespace {
+namespace xmlrpc_c {
 
 carriageParm_libwww0::carriageParm_libwww0(
     string const serverUrl
--- xmlrpc-c-1.04/src/cpp/wininet.cpp.namespace	2005-11-10 03:24:26.000000000 +0100
+++ xmlrpc-c-1.04/src/cpp/wininet.cpp	2005-12-15 21:04:01.000000000 +0100
@@ -32,7 +32,7 @@
 using namespace xmlrpc_c;
 
 
-namespace {
+namespace xmlrpc_c {
 
 carriageParm_wininet0::carriageParm_wininet0(
     string const serverUrl


--- NEW FILE xmlrpc-c.spec ---
%global _includedir		%_includedir/%name

%{!?release_func:%global release_func() %1%{?dist}}

Summary:	A lightweight RPC library based on XML and HTTP
Name:		xmlrpc-c
Version:	1.04
Release:	%release_func 1
License:	BSD/PSF -- see COPYING
Group:		System Environment/Libraries
URL:	 	http://xmlrpc-c.sourceforge.net/
Source0:	http://dl.sourceforge.net/sourceforge/xmlrpc-c/%name-%version.tgz
Patch0:		xmlrpc-c-1.04-libxml2.patch
Patch1:		xmlrpc-c-1.04-namespace.patch
BuildRoot:	%_tmppath/%name-%version-%release-root
#BuildRequires:	w3c-libwww-devel
BuildRequires:	curl-devel libxml2-devel

%package devel
Summary:	Development files for xmlrpc-c based programs
Group:		Development/Libraries
Requires:	%name = %version-%release
Requires:	libxml2-devel curl-devel

%package apps
Summary:	Sample XML-RPC applications
Group:		Applications/Internet


%description
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 and
C++.


%description devel
Static libraries and header files for writing XML-RPC applications in
C and C++.


%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.


%prep
%setup -q
%patch0 -p1 -b .libxml2
%patch1 -p1 -b .namespace

## workaround bugs in the buildsystem
rm -f src/cpp/srcdir transport_config.h

## not needed...
rm doc/{INSTALL,configure_doc}


%build
%configure --enable-libxml2-backend --disable-libwww-client

sed -i -e 's!-L/usr/%_lib\s\s*!!g;
	   s!-L/usr/%_lib"!"!g;
	   s!\(the_\S*rpath=\)\"..*\"!\1!g' xmlrpc-c-config

%__make \
	CFLAGS_COMMON="-DNDEBUG -fno-common $RPM_OPT_FLAGS"	\
	CXXFLAGS_COMMON="-DNDEBUG $RPM_OPT_FLAGS"		\
	#%{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
%__make DESTDIR="$RPM_BUILD_ROOT" install

%__install -d -m0755 $RPM_BUILD_ROOT%_mandir/man1

F=tools/xml-rpc-api2cpp/xml-rpc-api2cpp
./libtool --mode=install %__install -p -m755 $F $RPM_BUILD_ROOT/%_bindir/
%__install -p -m0644 $F.1 $RPM_BUILD_ROOT%_mandir/man1/

for i in $RPM_BUILD_ROOT%_libdir/*.a; do
	test ! -e "${i%%.a}.so" || rm -f $i
done

rm -f $RPM_BUILD_ROOT%_libdir/*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post   -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc doc/*
%_libdir/*.so.*


%files devel
%defattr(-,root,root,-)
%_bindir/xmlrpc-c-config
%_includedir
%_libdir/*.so
%_libdir/*.a


%files apps
%defattr(-,root,root,-)
%doc tools/xmlrpc/xmlrpc.html
%doc tools/xmlrpc_transport/xmlrpc_transport.html
%_mandir/man1/*
%_bindir/xmlrpc
%_bindir/xmlrpc_transport
%_bindir/xml-rpc-api2cpp


%changelog
* Sun Dec 18 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.04-1
- added libxml2-devel and openssl-devel Requires: for the -devel
  subpackage
- ship doc/* instead of doc
- initial Fedora Extras package (review 175840)

* Thu Dec 15 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.04-0.1
- disabled w3c-libwww because it does not exist anymore in FC5 and
  seems to be unmaintained upstream
- added missing libxml2-devel
- cleaned up list of %%doc files
- fixed gcc4.1 build issues
- removed static libraries when there exists a corresponding dynamic one


* Tue Aug  2 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.03.02-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2005 18:14:12 -0000	1.1
+++ .cvsignore	18 Dec 2005 18:16:01 -0000	1.2
@@ -0,0 +1 @@
+xmlrpc-c-1.04.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmlrpc-c/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2005 18:14:12 -0000	1.1
+++ sources	18 Dec 2005 18:16:01 -0000	1.2
@@ -0,0 +1 @@
+fc96628803ca72ebd86527039e4155df  xmlrpc-c-1.04.tgz




More information about the scm-commits mailing list