- sed script converted to patch

[packages/apache-tomcat.git] / apache-tomcat.spec

diff --git a/apache-tomcat.spec b/apache-tomcat.spec
index e8815e9c58c5e3deaf2ae087523b481c8c95e735..39e0306a2f5a79f77769427fa94d9662c3dae0d1 100644 (file)
--- a/apache-tomcat.spec
+++ b/apache-tomcat.spec
@@ -20,30 +20,33 @@ Patch2:             %{name}-native.patch
 Patch3:                %{name}-skip-jdt.patch
 Patch4:                %{name}-no-connectors.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
@@ -55,8 +58,6 @@ BuildRequires:        jsse >= 0:1.0.3
 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
@@ -72,15 +73,15 @@ Requires(pre):      /usr/sbin/groupadd
 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
@@ -88,7 +89,6 @@ Requires:     jndi >= 1.2.1
 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)
@@ -139,6 +139,7 @@ Dokumentacja do Tomcata - kontekera Servlet/JSP.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # servletapi built from jakarta-servletapi5.spec
 rm -rf servletapi
@@ -180,7 +181,7 @@ cd -
 
 # 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)
@@ -195,10 +196,13 @@ jasper-compiler-jdt.home=$TOPDIR/tomcat-deps
 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)
@@ -209,7 +213,8 @@ servletapi.build.notrequired=true
 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 \
@@ -287,7 +292,6 @@ ln -sf $(find-jar commons-digester) $TOMCATDIR/server/lib/commons-digester.jar
 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
@@ -295,7 +299,7 @@ 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