Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
Summary(pl.UTF-8): Silnik Servlet/JSP Apache będący wzorcową implementacją API Servlet 2.4/JSP 2.0
Name: apache-tomcat
-Version: 5.5.26
+Version: 5.5.27
Release: 0.1
License: Apache
Group: Development/Languages/Java
Source0: http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/%{name}-%{version}-src.tar.gz
-# Source0-md5: 642b6526354cb18c5b5d77ebef8109ae
+# Source0-md5: eb3f196013550b9b1684e4ff18593a8e
Source1: %{name}.init
Patch0: %{name}-skip-servletapi.patch
Patch1: %{name}-nsis.patch
Patch2: %{name}-native.patch
Patch3: %{name}-skip-jdt.patch
Patch4: %{name}-no-connectors.patch
-Patch5: %{name}-nowrite.patch
-Patch6: %{name}-dbcp.patch
+Patch5: %{name}-dbcp.patch
+# this patch is needed for struts >= 1.3
+Patch6: %{name}-struts.patch
URL: http://tomcat.apache.org/
BuildRequires: ant >= 1.5.3
BuildRequires: ant-trax
BuildRequires: eclipse-jdt
BuildRequires: jaas
-BuildRequires: jakarta-commons-beanutils >= 1.7
-BuildRequires: jakarta-commons-collections >= 0:3.1
-BuildRequires: jakarta-commons-collections-tomcat5 >= 0:3.1
-BuildRequires: jakarta-commons-daemon >= 1.0
-BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
-BuildRequires: jakarta-commons-dbcp-tomcat5 >= 0:1.2.1
-BuildRequires: jakarta-commons-digester >= 0:1.7
-BuildRequires: jakarta-commons-el >= 0:1.0
-BuildRequires: jakarta-commons-fileupload >= 0:1.0
BuildRequires: jakarta-commons-httpclient
-BuildRequires: jakarta-commons-launcher >= 0:0.9
-BuildRequires: jakarta-commons-logging >= 0:1.0.4
-BuildRequires: jakarta-commons-modeler >= 2.0
-BuildRequires: jakarta-commons-pool >= 0:1.2
-BuildRequires: jakarta-commons-pool-tomcat5 >= 0:1.2
BuildRequires: jakarta-regexp >= 0:1.3
-BuildRequires: jakarta-servletapi5
#BuildRequires: jakarta-struts >= 0:1.2.7
BuildRequires: jakarta-struts >= 1.0.2
+BuildRequires: java-commons-beanutils >= 1.7
+BuildRequires: java-commons-collections >= 0:3.1
+BuildRequires: java-commons-collections-tomcat5 >= 0:3.1
+BuildRequires: java-commons-daemon >= 1.0
+BuildRequires: java-commons-dbcp >= 0:1.2.1
+BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.2.1
+BuildRequires: java-commons-digester >= 0:1.7
+BuildRequires: java-commons-el >= 0:1.0
+BuildRequires: java-commons-fileupload >= 0:1.0
+BuildRequires: java-commons-io >= 1.4
+BuildRequires: java-commons-launcher >= 0:0.9
+BuildRequires: java-commons-logging >= 0:1.0.4
+BuildRequires: java-commons-modeler >= 2.0
+BuildRequires: java-commons-pool >= 0:1.2
+BuildRequires: java-commons-pool-tomcat5 >= 0:1.2
+BuildRequires: java-servletapi5
BuildRequires: javamail >= 0:1.3.1
BuildRequires: jaxp_parser_impl >= 0:2.7.1
BuildRequires: jdbc-stdext >= 0:2.0
BuildRequires: jta >= 0:1.0.1
BuildRequires: junit >= 0:3.8.1
BuildRequires: logging-log4j
-#BuildRequires: mx4j >= 0:3.0.1
-BuildRequires: mx4j >= 1.1.1
BuildRequires: puretls
BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: xerces-j >= 0:2.7.1
Requires(pre): /usr/sbin/useradd
Requires: jaas
#Requires: jaf >= 1.0.1
-#Requires: jakarta-commons-beanutils
-#Requires: jakarta-commons-collections
-#Requires: jakarta-commons-dbcp-tomcat5
-#Requires: jakarta-commons-digester
-Requires: jakarta-commons-el
-#Requires: jakarta-commons-fileupload
-#Requires: jakarta-commons-logging
Requires: jakarta-regexp
-Requires: jakarta-servletapi >= 4
+#Requires: java-commons-beanutils
+#Requires: java-commons-collections
+#Requires: java-commons-dbcp-tomcat5
+#Requires: java-commons-digester
+Requires: java-commons-el
+#Requires: java-commons-fileupload
+#Requires: java-commons-logging
+Requires: java-servletapi5
Requires: javamail >= 1.2
Requires: jaxp_parser_impl
Requires: jdbc-stdext >= 2.0
Requires: jre >= 1.2
Requires: jsse >= 1.0.2
Requires: jta >= 1.0.1
-Requires: mx4j >= 1.1.1
Requires: rc-scripts
Requires: xml-commons
Provides: group(http)
# build tomcat 5.5
cat > build.properties <<EOF
-commons-beanutils.jar=$(find-jar commons-beanutils)
+commons-beanutils.jar=$(find-jar commons-beanutils-core)
commons-launcher.jar=$(find-jar commons-launcher)
commons-daemon.jar=$(find-jar commons-daemon)
commons-digester.jar=$(find-jar commons-digester)
commons-httpclient.jar=$(find-jar commons-httpclient)
commons-collections.jar=$(find-jar commons-collections)
commons-fileupload.jar=$(find-jar commons-fileupload)
+commons-io.jar=$(find-jar commons-io)
jmx.jar=$(find-jar jmx)
jmx-tools.jar=$(find-jar jmx)
junit.jar=$(find-jar junit)
-struts.jar=$(find-jar struts)
+struts.jar=$(find-jar struts-core)
+struts-core.jar=$(find-jar struts-core)
+struts-taglib.jar=$(find-jar struts-taglib)
jcert.jar=$(find-jar jcert)
jnet.jar=$(find-jar jnet)
jsse.jar=$(find-jar jsse)
jsp-api.jar=$(find-jar jsp-api)
jspapi.build.notrequired=true
log4j.jar=$(find-jar log4j)
-tomcat-dbcp.jar=$(find-jar jakarta-commons-dbcp-tomcat5)
+tomcat-dbcp.jar=$(find-jar commons-dbcp-tomcat5)
+struts.lib=%{_datadir}/jakarta-struts
EOF
%ant \
ln -sf $(find-jar commons-fileupload) $TOMCATDIR/server/lib/commons-fileupload.jar
ln -sf $(find-jar commons-logging) $TOMCATDIR/server/lib/commons-logging.jar
ln -sf $(find-jar jaas) $TOMCATDIR/server/lib/jaas.jar
-ln -sf $(find-jar mx4j-jmx) $TOMCATDIR/server/lib/mx4j-jmx.jar
ln -sf $(find-jar regexp) $TOMCATDIR/server/lib/regexp.jar
ln -sf $(find-jar regexp) $TOMCATDIR/server/lib/jakarta-regexp-1.2.jar
ln -sf $(find-jar regexp) $TOMCATDIR/server/lib/regexp-1.2.jar
ln -sf $(find-jar jaxp_parser_impl) $TOMCATDIR/common/endorsed/jaxp_parser_impl.jar
ln -sf $(find-jar xml-commons-apis) $TOMCATDIR/common/endorsed/xml-commons-apis.jar
-ln -sf $(find-jar struts) $TOMCATDIR/server/webapps/admin/WEB-INF/lib/struts.jar
+ln -sf $(find-jar struts-core) $TOMCATDIR/server/webapps/admin/WEB-INF/lib/struts-core.jar
%clean
rm -rf $RPM_BUILD_ROOT
projects / packages / apache-tomcat.git / blobdiff