A few package fixes. Thanks to Michael Schloh.

xmlrpcpp/xmlrpcpp.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        RPC
 License:      LGPL
 Version:      0.7
-Release:      20061013
+Release:      20061015
 
 #   list of sources
 Source0:      http://switch.dl.sourceforge.net/xmlrpcpp/xmlrpc++%{version}.tar.gz
@@ -48,8 +48,8 @@ AutoReqProv:  no
 
 %description
     XmlRpc++ is an implementation of the XmlRpc protocol written in C++.
-    XmlRpc++ is designed to make it easy to incorporate XmlRpc client and
-    server support into C++ applications.
+    XmlRpc++ is designed to make it easy to incorporate XmlRpc client
+    and server support into C++ applications.
 
 %track
     prog xmlrpcpp = {
@@ -61,8 +61,18 @@ AutoReqProv:  no
 %prep
     %setup -q -n xmlrpc++%{version}
     %{l_shtool} subst \
-        -e 's;\(params[0][params[0].size\);(std::string)\1;' \
+        -e 's;\(params\[0]\[params\[0]\.size\);(std::string)\1;' \
         test/Validator.cpp
+    %{l_shtool} subst \
+        -e 's;^\(CXX[^=a-zA-Z]*\)=.*;\1= %{l_cxx};' \
+        -e 's;^\(GCCWARN.*\)-Wall -Wstrict-prototypes;\1-Wall;' \
+        test/Makefile \
+        Makefile
+    %{l_shtool} subst \
+        -e 's;^\(\$(TESTS):\).*;\1;' \
+        -e 's;^\(LIB[^=]*\)=.*;\1= -lXmlRpc;' \
+        -e 's;^\(SRC[^=]*\)=.*;\1= %{l_prefix}/include/xmlrpcpp;' \
+        test/Makefile
 
 %build
     %{l_make} %{l_mflags -O} libXmlRpc.a
@@ -70,9 +80,12 @@ AutoReqProv:  no
 %install
     rm -rf $RPM_BUILD_ROOT
     %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/lib
+        $RPM_BUILD_ROOT%{l_prefix}/lib \
+        $RPM_BUILD_ROOT%{l_prefix}/include/xmlrpcpp
     %{l_shtool} install -c -m 644 \
         *.a $RPM_BUILD_ROOT%{l_prefix}/lib/
+    %{l_shtool} install -c -m 644 \
+        src/*.h $RPM_BUILD_ROOT%{l_prefix}/include/xmlrpcpp/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files

xmlto/xmlto.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        XML
 License:      GPL
 Version:      0.0.18
-Release:      20061013
+Release:      20061015
 
 #   list of sources
 Source0:      http://cyberelk.net/tim/data/xmlto/stable/xmlto-%{version}.tar.bz2
@@ -41,8 +41,10 @@ Source0:      http://cyberelk.net/tim/data/xmlto/stable/xmlto-%{version}.tar.bz2
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, libxml, libxslt, docbook, getopt, mktemp
-PreReq:       OpenPKG, openpkg >= 20040130, libxml, libxslt, docbook, getopt, mktemp
+BuildPreReq:  OpenPKG, openpkg >= 20040130
+PreReq:       OpenPKG, openpkg >= 20040130
+BuildPreReq:  libxml, libxslt, tetex, docbook, getopt, mktemp
+PreReq:       libxml, libxslt, tetex, docbook, getopt, mktemp
 AutoReq:      no
 AutoReqProv:  no
 
@@ -65,8 +67,11 @@ AutoReqProv:  no
         -e 's;/bin/bash;@BASH@;g' \
         xmlto.in
     %{l_shtool} subst \
-        -e 's;/usr/bin/\([a-z]*\);`which \1`;g' \
+        -e 's;/usr/bin/\([a-z0-9\-\.]*\);`which \1`;g' \
         format/docbook/txt
+    %{l_shtool} subst \
+        -e 's;sh \("\$(dirname "\$0")\);%{l_bash} \1;g' \
+        format/docbook/dvi format/docbook/pdf format/docbook/ps
     %{l_shtool} subst \
         -e 's;bash ;$(BASH) ;g' \
         Makefile.in