packages (DEVEL): tomcat/tomcat.spec - create complete build.properties in ...

baggins baggins at pld-linux.org
Mon Dec 6 18:16:47 CET 2010


Author: baggins                      Date: Mon Dec  6 17:16:47 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- create complete build.properties in prep

---- Files affected:
packages/tomcat:
   tomcat.spec (1.172.2.24 -> 1.172.2.25) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.24 packages/tomcat/tomcat.spec:1.172.2.25
--- packages/tomcat/tomcat.spec:1.172.2.24	Mon Dec  6 11:09:23 2010
+++ packages/tomcat/tomcat.spec	Mon Dec  6 18:16:42 2010
@@ -271,6 +271,16 @@
 rm bin/{startup,shutdown}.sh
 
 cp -a %{SOURCE3} build.properties
+cat >>build.properties <<EOF
+
+log4j.jar=%(find-jar log4j)
+log4j12.jar=%(find-jar log4j)
+junit.jar=%(find-jar junit)
+logkit.jar=%(find-jar avalon-logkit)
+avalon-framework-impl.jar=%(find-jar avalon-framework-impl.jar)
+avalon-framework-api.jar=%(find-jar avalon-framework-api.jar)
+servletapi.jar=$(pwd)/output/build/lib/servlet-api.jar
+EOF
 
 %build
 export LC_ALL=en_US
@@ -286,15 +296,6 @@
 ln -sf %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
 ln -sf %{_javadir}/jsr109.jar output/extras/webservices/wsdl4j.jar
 
-cat > output/extras/logging/commons-logging-%{jclver}-src/build.properties << EOF
-log4j12.jar=%(find-jar log4j)
-junit.jar=%(find-jar junit)
-logkit.jar=%(find-jar avalon-logkit)
-avalon-framework-impl.jar=%(find-jar avalon-framework-impl.jar)
-avalon-framework-api.jar=%(find-jar avalon-framework-api.jar)
-servletapi.jar=$(pwd)/output/build/lib/servlet-api.jar
-EOF
-
 %ant -Dcommons-logging-version=%{jclver} extras
 
 # Javadoc
@@ -534,6 +535,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.172.2.25  2010/12/06 17:16:42  baggins
+- create complete build.properties in prep
+
 Revision 1.172.2.24  2010/12/06 10:09:23  baggins
 - kosher source0 url
 - merged my improvements from HEAD
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.24&r2=1.172.2.25&f=u



More information about the pld-cvs-commit mailing list