SPECS: xmlrpc-c.spec - updated soname patch, removed obsolete syntax-fix pa...

qboosh qboosh at pld-linux.org
Wed May 14 18:52:00 CEST 2008


Author: qboosh                       Date: Wed May 14 16:52:00 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated soname patch, removed obsolete syntax-fix patch
- cleanup, package legacy header symlinks

---- Files affected:
SPECS:
   xmlrpc-c.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/xmlrpc-c.spec
diff -u SPECS/xmlrpc-c.spec:1.23 SPECS/xmlrpc-c.spec:1.24
--- SPECS/xmlrpc-c.spec:1.23	Sun May 11 18:32:56 2008
+++ SPECS/xmlrpc-c.spec	Wed May 14 18:51:54 2008
@@ -4,27 +4,24 @@
 Name:		xmlrpc-c
 Version:	1.14.2
 Release:	0.1
-License:	XML-RPC C Library License
+License:	XML-RPC for C License (BSD-like)
 Group:		Libraries
 Source0:	%{name}-%{version}.tar.bz2
 # Source0-md5:	cbd9675dc48819d5f745b775fca7d425
 Patch0:		%{name}-fastdep.patch
 Patch1:		%{name}-soname.patch
 Patch2:		%{name}-cflags.patch
-Patch3:		%{name}-syntax-fix.patch
-Patch4:		%{name}-fixed-broken-format-string-modifiers-for-size_t-type.patch  
-Patch5:         %{name}-use-proper-datatypes.patch
+Patch3:		%{name}-fixed-broken-format-string-modifiers-for-size_t-type.patch  
+Patch4:         %{name}-use-proper-datatypes.patch
 URL:		http://xmlrpc-c.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	curl-devel
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel
+BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	w3c-libwww-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_includedir	%{_prefix}/include/%{name}
-
 %description
 XML-RPC C library - an implementation of the xmlrpc protocol.
 
@@ -38,7 +35,7 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	curl-devel
 Requires:	expat-devel
-Requires:	libxml2-devel
+Requires:	libxml2-devel >= 2.0
 Requires:	w3c-libwww-devel
 
 %description devel
@@ -62,15 +59,15 @@
 %prep
 %setup -q
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
-#%patch3 -p1
+%patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
+# hack: libtoolize removes config.* here
+cp -f /usr/share/automake/{missing,config.*} .
 %{__aclocal}
 %{__autoconf}
 OPTCFLAGS="%{rpmcflags}" ; export OPTCFLAGS
@@ -82,7 +79,6 @@
 	--enable-libxml2-backend \
 	--enable-curl-client \
 	--enable-libwww-client \
-	--enable-unicode \
 	--enable-abyss-threads
 
 %{__make} -j1
@@ -93,6 +89,9 @@
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+rm $RPM_BUILD_ROOT%{_includedir}/xmlrpc_server_w32httpsys.h \
+	$RPM_BUILD_ROOT%{_includedir}/xmlrpc-c/server_w32httpsys.h
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -101,21 +100,84 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README doc/{COPYING,CREDITS,HISTORY,SECURITY,TESTING,TODO}
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%ghost %attr(755,root,root) %{_libdir}/lib*.so.[0-9]
+%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.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_server_abyss.so.3
+%attr(755,root,root) %{_libdir}/libxmlrpc_server_cgi.so.*.*
+%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++
+%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) %{_libdir}/libxmlrpc_cpp.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_cpp.so.4
+%attr(755,root,root) %{_libdir}/libxmlrpc_packetsocket.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_packetsocket.so.4
+%attr(755,root,root) %{_libdir}/libxmlrpc_server++.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_server++.so.4
+%attr(755,root,root) %{_libdir}/libxmlrpc_server_abyss++.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_server_abyss++.so.4
+%attr(755,root,root) %{_libdir}/libxmlrpc_server_pstream++.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxmlrpc_server_pstream++.so.4
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/DEVELOPING
-%attr(755,root,root) %{_libdir}/lib*.so
-#%{_libdir}/lib*.la
-%{_includedir}
+%doc doc/{DEVELOPING,TESTING}
+%attr(755,root,root) %{_bindir}/xmlrpc-c-config
+# C
+%attr(755,root,root) %{_libdir}/libxmlrpc-c.so
+%attr(755,root,root) %{_libdir}/libxmlrpc_abyss.so
+%attr(755,root,root) %{_libdir}/libxmlrpc_client.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_util.so
+%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_pstream++.so
+%{_includedir}/xmlrpc-c/*.hpp
+# legacy
+%{_includedir}/XmlRpcCpp.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+# C
+%{_libdir}/libxmlrpc-c.a
+%{_libdir}/libxmlrpc_abyss.a
+%{_libdir}/libxmlrpc_client.a
+%{_libdir}/libxmlrpc_server.a
+%{_libdir}/libxmlrpc_server_abyss.a
+%{_libdir}/libxmlrpc_server_cgi.a
+%{_libdir}/libxmlrpc_util.a
+# C++
+%{_libdir}/libxmlrpc++.a
+%{_libdir}/libxmlrpc_client++.a
+%{_libdir}/libxmlrpc_cpp.a
+%{_libdir}/libxmlrpc_packetsocket.a
+%{_libdir}/libxmlrpc_server++.a
+%{_libdir}/libxmlrpc_server_abyss++.a
+%{_libdir}/libxmlrpc_server_pstream++.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -123,6 +185,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2008-05-14 16:51:54  qboosh
+- updated soname patch, removed obsolete syntax-fix patch
+- cleanup, package legacy header symlinks
+
 Revision 1.23  2008-05-11 16:32:56  areq
 - 1.14.2 NFY
 - soname.patch must be updated
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xmlrpc-c.spec?r1=1.23&r2=1.24&f=u



More information about the pld-cvs-commit mailing list