Author: pawelz Date: Tue Jun 8 22:06:32 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- don't try to download anything
---- Files affected:
packages/tomcat:
tomcat-build.xml.patch (1.2 -> 1.2.2.1) , tomcat.spec (1.172.2.1 ->
1.172.2.2)
---- Diffs:
================================================================
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.2
packages/tomcat/tomcat-build.xml.patch:1.2.2.1
--- packages/tomcat/tomcat-build.xml.patch:1.2 Tue Aug 18 17:40:11 2009
+++ packages/tomcat/tomcat-build.xml.patch Wed Jun 9 00:06:27 2010
@@ -1,15 +1,11 @@
---- build.xml~ 2009-05-14 01:15:28.000000000 +0200
-+++ build.xml 2009-08-13 16:50:16.000000000 +0200
-@@ -439,12 +439,6 @@
-
- <target name="deploy" depends="build-only,build-docs,warn.dbcp">
+--- tomcat-7.0.0/build.xml.orig 2010-06-08 15:46:01.000000000 +0200
++++ tomcat-7.0.0/build.xml 2010-06-09 00:01:40.000000000 +0200
+@@ -408,7 +408,7 @@
+
+ </target>
-- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-- file="${tomcat-native.tar.gz}" />
--
-- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
-- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" />
--
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
+- <target name="compile" depends="build-prepare,download-compile">
++ <target name="compile" depends="build-prepare">
+
+ <!-- Compile internal server components -->
+ <javac srcdir="java" destdir="${tomcat.classes}"
================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.1
packages/tomcat/tomcat.spec:1.172.2.2
--- packages/tomcat/tomcat.spec:1.172.2.1 Tue Jun 8 23:56:54 2010
+++ packages/tomcat/tomcat.spec Wed Jun 9 00:06:27 2010
@@ -28,6 +28,7 @@
Source12: %{name}-context-manager.xml
Source13: %{name}-context-host-manager.xml
Source14: %{name}-context-examples.xml
+Patch0: %{name}-build.xml.patch
URL: http://tomcat.apache.org/
BuildRequires: ant >= 1.5.3
BuildRequires: ant-trax
@@ -219,6 +220,8 @@
%prep
%setup -q
+%patch0 -p1
+
# we don't need those scripts
rm bin/*.bat
rm bin/{startup,shutdown}.sh
@@ -453,6 +456,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.172.2.2 2010/06/08 22:06:27 pawelz
+- don't try to download anything
+
Revision 1.172.2.1 2010/06/08 21:56:54 pawelz
- first attempt to package tomcat 7
- does not build yet
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-build.xml.patch?r1=1.2&r2=1.2.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.1&r2=1.172.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
