packages (DEVEL): tomcat/tomcat-build.xml.patch, tomcat/tomcat.spec - don't...

[pawelz]

Author: pawelz                       Date: Tue Jun  8 23:13:58 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- don't try to package tomcat-native nor commons-daemon. These libs are
  packages as separate specs.
- fixed javadoc and extras ant invocations
- it almost builds (fails in extras, because of an attempt to download some libs)

---- Files affected:
packages/tomcat:
   tomcat-build.xml.patch (1.2.2.1 -> 1.2.2.2) , tomcat.spec (1.172.2.2 -> 1.172.2.3) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.2.2.1 packages/tomcat/tomcat-build.xml.patch:1.2.2.2
--- packages/tomcat/tomcat-build.xml.patch:1.2.2.1	Wed Jun  9 00:06:27 2010
+++ packages/tomcat/tomcat-build.xml.patch	Wed Jun  9 01:13:52 2010
@@ -9,3 +9,19 @@
  
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
+--- tomcat-7.0.0/build.xml~	2010-06-09 00:15:23.000000000 +0200
++++ tomcat-7.0.0/build.xml	2010-06-09 00:48:59.000000000 +0200
+@@ -667,13 +667,6 @@
+   <target name="deploy" depends="package,build-docs"
+           description="Default. Builds a working Tomcat instance">
+ 
+-    <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+-            file="${tomcat-native.tar.gz}" />
+-    <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+-            file="${commons-daemon.native.src.tgz}" />
+-
+-    <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.2 packages/tomcat/tomcat.spec:1.172.2.3
--- packages/tomcat/tomcat.spec:1.172.2.2	Wed Jun  9 00:06:27 2010
+++ packages/tomcat/tomcat.spec	Wed Jun  9 01:13:52 2010
@@ -234,7 +234,7 @@
 %ant -Drpm.javadir=%{_javadir} -Drpm.libdir=%{_libdir}
 
 %if %{with javadoc}
-%ant -f dist.xml dist-javadoc
+%ant javadoc
 %endif
 
 %if %{with webservices}
@@ -243,7 +243,7 @@
 ln -s %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
 ln -s %{_javadir}/jsr109.jar output/extras/webservices/wsdl4j.jar
 
-%ant -f extras.xml webservices
+%ant extras
 %endif
 
 
@@ -456,6 +456,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.172.2.3  2010/06/08 23:13:52  pawelz
+- don't try to package tomcat-native nor commons-daemon. These libs are
+  packages as separate specs.
+- fixed javadoc and extras ant invocations
+- it almost builds (fails in extras, because of an attempt to download some libs)
+
 Revision 1.172.2.2  2010/06/08 22:06:27  pawelz
 - don't try to download anything
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-build.xml.patch?r1=1.2.2.1&r2=1.2.2.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.2&r2=1.172.2.3&f=u