From f952cac26b29edb9cde774f183cc0b13c203cd7c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Fri, 19 Nov 2010 20:23:32 +0000
Subject: [PATCH] - add security policy for distro java dir - ln -sf in build
 for short-circuit build

Changed files:
    tomcat.spec -> 1.182
---
 tomcat.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tomcat.spec b/tomcat.spec
index 8aba76c..2dff62b 100644
--- 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
-- 
2.43.0