cleanup and fix packaging; add optional Java API support

spread/spread.spec

@@ -37,10 +37,11 @@ Class:        PLUS
 Group:        RPC
 License:      BSD-style
 Version:      %{V_spread}
-Release:      20061205
+Release:      20070907
 
 #   package options
 %option       with_perl   no
+%option       with_java   no
 
 #   list of sources
 Source0:      http://www.spread.org/download/::/spread-src-%{V_spread}.tar.gz
@@ -56,6 +57,10 @@ PreReq:       OpenPKG, openpkg >= 20060823
 BuildPreReq:  perl, perl-openpkg >= 5.8.3-20040126
 PreReq:       perl, perl-openpkg >= 5.8.3-20040126
 %endif
+%if "%{with_java}" == "yes"
+BuildPreReq:  java, ant
+PreReq:       java
+%endif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -91,13 +96,10 @@ AutoReqProv:  no
         -e "s;^[# \t]*\(RuntimeDir\).*;\1 = %{l_prefix}/var/spread;" \
         -e "s;^[# \t]*\(EventLogFile\).*;\1 = %{l_prefix}/var/spread/spread.log;" \
         -e "s;^[ \t]*localhost[ \t]*127.0.0.1;\t`%{l_shtool} echo -e %h%d`;" \
-        sample.spread.conf
+        docs/sample.spread.conf
     %{l_shtool} subst \
         -e "s;/etc\(/spread.access_ip\);%{l_prefix}/etc/spread\1;g" \
-        auth-ip.c
-    %{l_shtool} subst \
-        -e "s;My\.name;\"spread.log\";g" \
-        log.c
+        daemon/auth-ip.c
 %if "%{with_perl}" == "yes"
     %{l_shtool} subst \
         -e 's;\.\./spread-src-3.17.0/;../include;' \
@@ -131,6 +133,13 @@ AutoReqProv:  no
     %{l_prefix}/bin/perl-openpkg -d Spread-%{V_spread_perl} prepare configure build
 %endif
 
+    #   build Java extension
+%if "%{with_java}" == "yes"
+    ( cd java
+      ant
+    ) || exit $?
+%endif
+
 %install
     rm -rf $RPM_BUILD_ROOT
 
@@ -142,12 +151,21 @@ AutoReqProv:  no
     >perl-openpkg-files
 %endif
 
+    #   build Java extension
+%if "%{with_java}" == "yes"
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/lib/java
+    %{l_shtool} install -c -m 644 \
+        java/dest/spread-*.jar \
+        $RPM_BUILD_ROOT%{l_prefix}/lib/java/
+%endif
+
     #   install toolkit
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
 
     #   strip down installation
     rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.s[ol]* >/dev/null 2>&1 || true
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/share/doc >/dev/null 2>&1 || true
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc >/dev/null 2>&1 || true
 
     #   create additional run-time directory
     %{l_shtool} mkdir -f -p -m 755 \