packages (DEVEL): tomcat/tomcat-build.xml.patch, tomcat/tomcat.spec - build...
pawelz
pawelz at pld-linux.org
Thu Jun 10 10:34:23 CEST 2010
Author: pawelz Date: Thu Jun 10 08:34:23 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- build extras.
---- Files affected:
packages/tomcat:
tomcat-build.xml.patch (1.2.2.3 -> 1.2.2.4) , tomcat.spec (1.172.2.7 -> 1.172.2.8)
---- Diffs:
================================================================
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.2.2.3 packages/tomcat/tomcat-build.xml.patch:1.2.2.4
--- packages/tomcat/tomcat-build.xml.patch:1.2.2.3 Wed Jun 9 13:02:53 2010
+++ packages/tomcat/tomcat-build.xml.patch Thu Jun 10 10:34:17 2010
@@ -1,5 +1,5 @@
---- tomcat-7.0.0/build.xml.orig 2010-06-09 12:07:55.000000000 +0200
-+++ tomcat-7.0.0/build.xml 2010-06-09 12:08:42.000000000 +0200
+--- tomcat-7.0.0/build.xml.orig 2010-06-10 09:45:49.000000000 +0200
++++ tomcat-7.0.0/build.xml 2010-06-10 09:43:07.000000000 +0200
@@ -408,7 +408,7 @@
</target>
@@ -49,7 +49,20 @@
<replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/src/java/org/apache/commons"
encoding="ISO-8859-1">
<replacefilter token="org.apache.commons"
-@@ -1064,18 +1047,6 @@
+@@ -986,12 +969,6 @@
+
+ <ant antfile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"
+ dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
+- target="getlibs" />
+- <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src">
+- <fileset dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/lib" />
+- </copy>
+- <ant antfile="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src/build2.xml"
+- dir="${tomcat.extras}/logging/commons-logging-${commons-logging-version}-src"
+ target="compile" />
+
+ <jar jarfile="${tomcat-juli-extras.jar}"
+@@ -1064,18 +1041,6 @@
depends="extras-prepare,compile,build-manifests"
description="Build web services extras package">
@@ -68,7 +81,7 @@
<copy file="${jaxrpc-lib.jar}"
tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
<copy file="${wsdl4j-lib.jar}"
-@@ -1176,7 +1147,7 @@
+@@ -1176,7 +1141,7 @@
</target>
@@ -77,7 +90,7 @@
<!-- This is why releasing must be done on Windows / with wine:
otherwise this check fails and the .exe distro is not generated -->
<condition property="execute.installer">
-@@ -1843,232 +1814,7 @@
+@@ -1843,232 +1808,7 @@
description="Delete the default output folders">
<delete dir="${tomcat.output}" />
</target>
================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.7 packages/tomcat/tomcat.spec:1.172.2.8
--- packages/tomcat/tomcat.spec:1.172.2.7 Wed Jun 9 19:01:05 2010
+++ packages/tomcat/tomcat.spec Thu Jun 10 10:34:17 2010
@@ -2,13 +2,14 @@
# Conditional build:
%bcond_without javadoc # skip building javadocs
-%bcond_with extras # build extras
%define jspapiver 2.1
%define servletapiver 2.5
%define subver rc4
%define rel 0.1
+# Java Commons Logging version. Must be >= 1.1.
+%define jclver 1.1.1
%include /usr/lib/rpm/macros.java
Summary: Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP %{jspapiver} API
@@ -28,7 +29,10 @@
Source12: %{name}-context-manager.xml
Source13: %{name}-context-host-manager.xml
Source14: %{name}-context-examples.xml
+Source100: http://www.apache.org/dist/commons/logging/source/commons-logging-%{jclver}-src.tar.gz
+# Source100-md5: e5cfa8cca13152d7545fde6b1783c60a
Patch0: %{name}-build.xml.patch
+Patch100: jcl-build.xml.patch
URL: http://tomcat.apache.org/
BuildRequires: ant >= 1.5.3
BuildRequires: ant-trax
@@ -36,10 +40,8 @@
BuildRequires: java-commons-daemon >= 1.0
BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.1
BuildRequires: java-commons-pool-tomcat5
-%if %{with extras}
BuildRequires: java(JSR109)
BuildRequires: java-geronimo-spec-jaxrpc
-%endif
BuildRequires: java-jdbc-mysql
BuildRequires: java-mail
BuildRequires: jdk
@@ -218,10 +220,18 @@
javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext).
%prep
-%setup -q
+%setup -q -a100
%patch0 -p1
+# Prepare java-commmons-logging sources
+mkdir -p output/extras/logging
+mv commons-logging-%{jclver}-src output/extras/logging
+cd output/extras/logging/commons-logging-%{jclver}-src
+%undos build.xml
+%patch100 -p1
+cd -
+
# we don't need those scripts
rm bin/*.bat
rm bin/{startup,shutdown}.sh
@@ -231,21 +241,30 @@
%build
export LC_ALL=en_US
+# Base package
%ant -Drpm.javadir=%{_javadir} -Drpm.libdir=%{_libdir}
-%if %{with javadoc}
-%ant javadoc
-%endif
-
-%if %{with extras}
+# Extras
mkdir -p output/extras/webservices
ln -s %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
ln -s %{_javadir}/jsr109.jar output/extras/webservices/wsdl4j.jar
-%ant extras
-%endif
+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
+%if %{with javadoc}
+%ant javadoc
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -321,12 +340,14 @@
ln -sf %{_javadir}/tomcat-coyote.jar $TOMCATDIR/lib/tomcat-coyote.jar
-%if %{with extras}
install ../extras/catalina-ws.jar $TOMCATDIR/lib/catalina-ws.jar
+install ../extras/tomcat-juli-adapters.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-juli-adapters.jar
+install ../extras/tomcat-juli.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-juli.jar
+ln -sf %{_javadir}/tomcat-juli-adapters.jar $TOMCATDIR/lib/juli-adapters.jar
+ln -sf %{_javadir}/tomcat-juli.jar $TOMCATDIR/lib/juli.jar
ln -s %{_javadir}/geronimo-spec-jaxrpc.jar $TOMCATDIR/lib/jaxrpc.jar
ln -s %{_javadir}/jsr109.jar $TOMCATDIR/lib/jsr109.jar
-%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -378,6 +399,8 @@
%{_tomcatdir}/lib/jasper-el.jar
%{_tomcatdir}/lib/jasper.jar
%{_tomcatdir}/lib/jsp-api.jar
+%{_tomcatdir}/lib/juli-adapters.jar
+%{_tomcatdir}/lib/juli.jar
%{_tomcatdir}/lib/mail.jar
%{_tomcatdir}/lib/mysql-connector-java.jar
%{_tomcatdir}/lib/org.eclipse.jdt.core.jar
@@ -431,13 +454,11 @@
%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/examples.xml
%{_tomcatdir}/webapps/examples
-%if %{with extras}
%files webservices
%defattr(644,root,root,755)
%{_tomcatdir}/lib/catalina-ws.jar
%{_tomcatdir}/lib/jsr109.jar
%{_tomcatdir}/lib/jaxrpc.jar
-%endif
%files -n java-tomcat-jasper
%defattr(644,root,root,755)
@@ -448,6 +469,8 @@
%defattr(644,root,root,755)
%{_javadir}/tomcat-api.jar
%{_javadir}/tomcat-catalina.jar
+%{_javadir}/tomcat-juli-adapters.jar
+%{_javadir}/tomcat-juli.jar
%{_javadir}/tomcat-util.jar
%files -n java-tomcat-coyote
@@ -465,6 +488,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.172.2.8 2010/06/10 08:34:17 pawelz
+- build extras.
+
Revision 1.172.2.7 2010/06/09 17:01:05 pawelz
- install api and util jars with catalina subpackage
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-build.xml.patch?r1=1.2.2.3&r2=1.2.2.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.7&r2=1.172.2.8&f=u
More information about the pld-cvs-commit
mailing list