Author: glen Date: Thu Apr 19 20:36:35 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - BUILDS, so cleaning up
---- Files affected: SPECS: jakarta-tomcat.spec (1.47 -> 1.48) ---- Diffs: ================================================================ Index: SPECS/jakarta-tomcat.spec diff -u SPECS/jakarta-tomcat.spec:1.47 SPECS/jakarta-tomcat.spec:1.48 --- SPECS/jakarta-tomcat.spec:1.47 Thu Apr 19 22:13:31 2007 +++ SPECS/jakarta-tomcat.spec Thu Apr 19 22:36:30 2007 @@ -1,4 +1,6 @@ # $Revision$, $Date$ +# TODO +# - spec vs filename # # Conditional build: %bcond_with binary # build from binary source @@ -11,10 +13,8 @@ Release: 0.1 License: Apache Group: Development/Languages/Java -#Source0: http://www.apache.org/dist/tomcat/tomcat-5/v5.0.30/src/%{name}-%{version}-src.tar.gz Source0: http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/%{name}-%{version}-src.tar.gz # Source0-md5: 362d1d8b15dc09882440dcab8c592dd7 -#Source0: http://apache.zone-h.org/ Source1: jakarta-tomcat.init Patch0: %{name}-skip-servletapi.patch Patch1: %{name}-nsis.patch @@ -22,8 +22,9 @@ Patch3: %{name}-skip-jdt.patch Patch4: %{name}-no-connectors.patch URL: http://tomcat.apache.org/ -# required: BuildRequires: ant >= 1.5.3 +BuildRequires: ant-trax +BuildRequires: eclipse-jdt BuildRequires: jaas BuildRequires: jakarta-commons-beanutils BuildRequires: jakarta-commons-collections @@ -32,10 +33,10 @@ BuildRequires: jakarta-commons-dbcp BuildRequires: jakarta-commons-dbcp-source BuildRequires: jakarta-commons-digester +%{?with_javadoc:BuildRequires: jakarta-commons-el} BuildRequires: jakarta-commons-fileupload BuildRequires: jakarta-commons-httpclient BuildRequires: jakarta-commons-launcher -BuildRequires: eclipse-jdt BuildRequires: jakarta-commons-logging BuildRequires: jakarta-commons-modeler >= 2.0 BuildRequires: jakarta-commons-pool @@ -43,28 +44,21 @@ BuildRequires: jakarta-regexp BuildRequires: jakarta-servletapi5 BuildRequires: jakarta-struts >= 1.0.2 -BuildRequires: jaxp_parser_impl -BuildRequires: jdk >= 1.5 -BuildRequires: jpackage-utils -BuildRequires: mx4j >= 1.1.1 -BuildRequires: puretls -BuildRequires: rpmbuild(macros) >= 1.300 -BuildRequires: xerces-j -%if %{with javadoc} -BuildRequires: jakarta-commons-el -%endif -# optional: -BuildRequires: jaf >= 1.0.1 -BuildRequires: jakarta-commons-dbcp -BuildRequires: jakarta-commons-pool BuildRequires: javamail >= 1.2 +BuildRequires: jaxp_parser_impl BuildRequires: jdbc-stdext >= 2.0 +BuildRequires: jdk >= 1.5 BuildRequires: jndi >= 1.2.1 +BuildRequires: jpackage-utils BuildRequires: jsse >= 1.0.2 BuildRequires: jta >= 1.0.1 BuildRequires: junit >= 3.7 -BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: logging-log4j +BuildRequires: mx4j >= 1.1.1 +BuildRequires: puretls +BuildRequires: rpmbuild(macros) >= 1.300 BuildRequires: tyrex >= 1.0 +BuildRequires: xerces-j BuildRequires: xml-commons Requires(post,postun): /sbin/ldconfig Requires(post,preun): /sbin/chkconfig @@ -75,7 +69,7 @@ Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires: jaas -Requires: jaf >= 1.0.1 +#Requires: jaf >= 1.0.1 Requires: jakarta-commons-beanutils Requires: jakarta-commons-collections Requires: jakarta-commons-digester @@ -149,8 +143,6 @@ %build TOPDIR=$(pwd) -#xerces.jar=$(build-classpath xerces) -#jasper-compiler-jdt.jar=$(build-classpath jdtcore) mkdir -p tomcat-deps > tomcat-deps/tomcat-dbcp.jar @@ -185,7 +177,6 @@ %endif # build tomcat 5.5 -#cd build cat > build.properties <<EOF commons-beanutils.jar=$(build-classpath commons-beanutils) commons-launcher.jar=$(build-classpath commons-launcher) @@ -199,183 +190,36 @@ xml-apis.jar=$(build-classpath xml-commons-apis) jdt.jar=$(build-classpath org.eclipse.jdt.core) jasper-compiler-jdt.home=$TOPDIR/tomcat-deps -%if 0 -log4j.jar=${log4j.lib}/dist/lib/log4j-1.2.12.jar -%endif commons-httpclient.jar=$(build-classpath commons-httpclient) commons-collections.jar=$(build-classpath commons-collections) commons-fileupload.jar=$(build-classpath commons-fileupload) - - -%if 0 -jmx.jar=${jmx.lib}/mx4j.jar -%endif jmx.jar=$(build-classpath jre/jmx) -%if 0 -jmx-tools.jar=${jmx.lib}/mx4j-tools.jar -%endif jmx-tools.jar=$(build-classpath jre/jmx) -%if 0 -jmx-remote.jar=${jmx.lib}/mx4j-remote.jar -%endif junit.jar=$(build-classpath junit) -%if 0 -rhino.jar=${rhino.home}/js.jar -%endif struts.jar=$(build-classpath struts) -activation.jar=$(build-classpath jaf) jcert.jar=$(build-classpath java/jcert) jnet.jar=$(build-classpath java/jnet) jsse.jar=$(build-classpath java/jsse) jta.jar=$(build-classpath jta) -mail.jar=$(build-classpath javamail/mailapi) puretls.jar=$(build-classpath puretls) - servlet-api.jar=$(build-classpath servlet-api) -# how the fck those bools work -# build.xml:103: servletapi/jsr154/src not found. servletapi.build.notrequired=true - jsp-api.jar=$(build-classpath jsp-api) jspapi.build.notrequired=true - -log4j.jar=$(build-classpath logging-log4j) -#log4j.loc=%{_javadir} - +log4j.jar=$(build-classpath log4j) # source is needed because source is copied modified and recompiled as tomcat jar # see <target name="-build-tomcat-dbcp"> in build/build.xml -tomcat-dbcp.home= commons-collections.home=%{_prefix}/src/jakarta-commons-collections-3.1 commons-pool.home=%{_prefix}/src/jakarta-commons-pool-1.3 commons-dbcp.home=%{_prefix}/src/jakarta-commons-dbcp-1.2.1 tomcat-dbcp.home=$TOPDIR/tomcat-deps # err, it compiles three above and then appends to the jar, so the file should exist tomcat-dbcp.jar=$TOPDIR/tomcat-deps/tomcat-dbcp.jar - -%if 0 -ant.jar=%{_javadir}/ant.jar -ant-launcher.jar=%{_javadir}/ant-launcher.jar -jtc.home=$TOPDIR/jakarta-tomcat-connectors/ -jasper.home=$TOPDIR/jakarta-tomcat-jasper/jasper2 -commons-dbcp.jar=$(build-classpath commons-dbcp) -commons-pool.jar=$(build-classpath commons-pool) -jmxri.jar=$(build-classpath jre/jmx) -regexp.jar=$(build-classpath regexp) -jsp-api.jar=$TOPDIR/jakarta-servletapi-5/jsr152/dist/lib/jsp-api.jar -servlet.doc=$TOPDIR/jakarta-servletapi-5/jsr154/dist/docs/api -struts.lib=%{_datadir}/struts -servletapi.build.notrequired=true -tyrex.jar=$(build-classpath tyrex) -jaas.jar=$(build-classpath jre/jaas) -jndi.jar=$(build-classpath jre/jndi) -jdbc20ext.jar=$(build-classpath jdbc-stdext) -jspapi.build.notrequired=true -taglibs-core.jar=$(build-classpath taglibs-core) -taglibs-standard.jar=$(build-classpath taglibs-standard) -%endif - EOF %ant \ -Dcompile.source=1.4 -exit 1 - -# build the connectors -cd connectors - -%if 0 - -# this is just plain and simply evil but something changed in a major way between 5.0.16 and 5.0.18 -oldclasspath=$CLASSPATH -export CLASSPATH=$TOPDIR/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar:\ -$TOPDIR/jakarta-tomcat-5/build/server/lib/catalina.jar -%endif - -%if 0 -cat > build.properties <<EOF - -activation.jar=$(build-classpath jaf) -ant.jar=%{_javadir}/ant.jar -junit.jar=$(build-classpath junit) -commons-beanutils.jar=$(build-classpath commons-beanutils) -commons-collections.jar=$(build-classpath commons-collections) -commons-digester.jar=$(build-classpath commons-digester) -commons-fileupload.jar=$(build-classpath commons-fileupload) -commons-logging.jar=$(build-classpath commons-logging) -commons-logging-api.jar=$(build-classpath commons-logging-api) -commons-modeler.jar=$(build-classpath commons-modeler) -commons-pool.jar=$(build-classpath commons-pool) -regexp.jar=$(build-classpath regexp) -jmx.jar=$(build-classpath mx4j/mx4j) -puretls=$(build-classpath puretls) -activation.jar=$(build-classpath jaf) -mail.jar=$(build-classpath javamail/mailapi) -jta.jar=$(build-classpath jta) -tyrex.jar=$(build-classpath tyrex) -jaas.jar=$(build-classpath jaas) -jndi.jar=$(build-classpath jndi) -jdbc20ext.jar=$(build-classpath java/jdbc-stdext) -puretls.jar=$(build-classpath puretls) -jcert.jar=$(build-classpath jsse/jcert) -jnet.jar=$(build-classpath jsse/jnet) -jsse.jar=$(build-classpath jsse/jsse) - -%endif - -%if 0 -commons-beanutils.jar=${commons-beanutils.lib}/commons-beanutils.jar -commons-collections.jar=${commons-collections.lib}/commons-collections.jar -commons-digester.jar=${commons-digester.lib}/commons-digester.jar -commons-fileupload.jar=${commons-fileupload.lib}/commons-fileupload-1.0-beta-1.jar -commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar -commons-logging.jar=${commons-logging.lib}/commons-logging.jar -jndi.jar=${jndi.lib}/jndi.jar -ldap.jar=${jndi.lib}/ldap.jar -jaas.jar=${jndi.lib}/jaas.jar -regexp.jar=${regexp.lib}/jakarta-regexp-1.4.jar -servlet.jar=${servlet.lib}/servlet.jar -#xerces.jar=${xerces.lib}/xerces.jar -xercesImpl.jar=${xerces.lib}/xercesImpl.jar -xml-apis.jar=${xerces.lib}/xml-apis.jar -activation.jar=${activation.lib}/activation.jar -commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar -commons-dbcp.jar=${commons-dbcp.lib}/commons-dbcp.jar -commons-modeler.jar=${commons-modeler.lib}/commons-modeler.jar -commons-pool.jar=${commons-pool.lib}/commons-pool.jar -jdbc20ext.jar=${jdbc20ext.lib}/jdbc2_0-stdext.jar -jmx.jar=${jmx.lib}/mx4j-jmx.jar -jcert.jar=${jsse.lib}/jcert.jar -jnet.jar=${jsse.lib}/jnet.jar -jsse.jar=${jsse.lib}/jsse.jar -jta.jar=${jta.lib}/jta.jar -junit.jar=${junit.lib}/junit.jar -mail.jar=${mail.lib}/mail.jar -puretls.jar=${puretls.lib}/puretls.jar -struts.jar=${struts.lib}/struts.jar -tyrex.jar=${tyrex.lib}/tyrex-1.0.jar -tomcat5.jar=${tomcat5.home}/server/lib/catalina.jar -servlet-api.jar=${tomcat5.home}/common/lib/servlet-api.jar -tomcat41.jar=${tomcat41.home}/server/lib/catalina.jar -servlet-api.jar=${tomcat41.home}/common/lib/servlet.jar -tomcat33.jar=${tomcat33.home}/lib/common/tomcat_core.jar -%endif - - -%if 0 -EOF -%ant build \ - -Dbuild.compiler=modern \ - -Djava.home=%{java_home} -%endif -%if 0 -export CLASSPATH=$oldclasspath - -# build the webapps and make the tree ready to install -cd ../jakarta-tomcat-5 -%ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist -%endif - %install rm -rf $RPM_BUILD_ROOT @@ -518,6 +362,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.48 2007/04/19 20:36:30 glen +- BUILDS, so cleaning up + Revision 1.47 2007/04/19 20:13:31 glen - update ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/jakarta-tomcat.spec?r1=1.47&r2=1.48&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
