- updated soname patch, removed obsolete syntax-fix patch

- cleanup, package legacy header symlinks

Changed files:
    xmlrpc-c.spec -> 1.24

diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec
index f73e842b9c6f97b1f71d32d9e326820ef825fb59..71c5de7dea0c9f7c149e8f4562e891ad15958163 100644 (file)
--- a/xmlrpc-c.spec
+++ b/xmlrpc-c.spec
@@ -3,27 +3,24 @@ Summary(pl.UTF-8):    Biblioteka XML-RPC C - implementacja protokołu xmlrpc
 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.
 
@@ -37,7 +34,7 @@ Group:                Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      curl-devel
 Requires:      expat-devel
-Requires:      libxml2-devel
+Requires:      libxml2-devel >= 2.0
 Requires:      w3c-libwww-devel
 
 %description devel
@@ -61,15 +58,15 @@ Biblioteki statyczne XML-RPC C.
 %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
@@ -81,7 +78,6 @@ OPTCXXFLAGS="%{rpmcxxflags}" ; export OPTCXXFLAGS
        --enable-libxml2-backend \
        --enable-curl-client \
        --enable-libwww-client \
-       --enable-unicode \
        --enable-abyss-threads
 
 %{__make} -j1
@@ -92,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__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
 
@@ -100,18 +99,81 @@ rm -rf $RPM_BUILD_ROOT
 
 %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