- add security policy for distro java dir

[packages/tomcat.git] / tomcat.spec

diff --git a/tomcat.spec b/tomcat.spec
index 8aba76c90a8eb455509f6e590e9b4a57845a3387..2dff62b8a1464113b751dca63a496018be335621 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -11,7 +11,7 @@ Summary:      Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP
 Summary(pl.UTF-8):     Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
 Name:          tomcat
 Version:       6.0.29
-Release:       3.1
+Release:       3.7
 License:       Apache v2.0
 Group:         Networking/Daemons/Java
 Source0:       http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
@@ -28,6 +28,7 @@ Patch0:               %{name}-build.xml.patch
 Patch1:                %{name}-extras.xml.patch
 Patch2:                server.xml-URIEncoding-utf8.patch
 Patch3:                %{name}-LDAPUserDatabase.patch
+Patch4:                %{name}-catalina.policy-javadir.patch
 URL:           http://tomcat.apache.org/
 BuildRequires: ant >= 1.5.3
 BuildRequires: ant-trax
@@ -222,6 +223,7 @@ javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext).
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # we don't need those scripts
 rm bin/*.bat
@@ -243,8 +245,8 @@ TOPDIR=$(pwd)
 %if %{with webservices}
 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
+ln -sf %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
+ln -sf %{_javadir}/jsr109.jar output/extras/webservices/wsdl4j.jar
 
 %ant -f extras.xml webservices
 %endif