X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=tomcat.spec;h=2dff62b8a1464113b751dca63a496018be335621;hb=f952cac26b29edb9cde774f183cc0b13c203cd7c;hp=41b11991a90c259dc393bc0fd9d1f9111904c52b;hpb=d03400448fdf5369ea3c098fdea21c4fb083b136;p=packages%2Ftomcat.git

diff --git a/tomcat.spec b/tomcat.spec
index 41b1199..2dff62b 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,22 +1,21 @@
 
 # Conditional build:
 %bcond_without	javadoc		# skip building javadocs
-%bcond_without	java_sun	# build with gcj (does not work)
 %bcond_without	webservices	# skip building webservices
 
 %define		jspapiver	2.1
 %define		servletapiver	2.5
 
 %include	/usr/lib/rpm/macros.java
-Summary:	Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP %{jspapiver}API
+Summary:	Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP %{jspapiver} API
 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.20
-Release:	6
+Version:	6.0.29
+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
-# Source0-md5:	44f49e7e14028b6a53c3c346bd18c72f
+# Source0-md5:	260de5ae62f415b9c085c5aeed4ef24c
 Source1:	apache-%{name}.init
 Source2:	apache-%{name}.sysconfig
 Source3:	%{name}-build.properties
@@ -27,30 +26,25 @@ Source13:	%{name}-context-host-manager.xml
 Source14:	%{name}-context-examples.xml
 Patch0:		%{name}-build.xml.patch
 Patch1:		%{name}-extras.xml.patch
-Patch2:		%{name}-bug47316.patch
+Patch2:		server.xml-URIEncoding-utf8.patch
+Patch3:		%{name}-LDAPUserDatabase.patch
+Patch4:		%{name}-catalina.policy-javadir.patch
 URL:		http://tomcat.apache.org/
-BuildRequires:	apr-devel
-BuildRequires:	autoconf
-BuildRequires:	libtool
-BuildRequires:	openssl-devel
-%if %{with java_sun}
-BuildRequires:	java-sun >= 1.5
-BuildRequires:	java-sun-jre >= 1.5
-%else
-BuildRequires:	java-gcj-compat-devel
-%endif
 BuildRequires:	ant >= 1.5.3
 BuildRequires:	ant-trax
-BuildRequires:	eclipse-jdt >= 3.2
-BuildRequires:	java-commons-collections >= 0:2.0
 BuildRequires:	java-commons-daemon >= 1.0
 BuildRequires:	java-commons-dbcp-tomcat5 >= 0:1.1
 BuildRequires:	java-commons-pool-tomcat5
+BuildRequires:	java-eclipse-jdt >= 3.2
 %if %{with webservices}
 BuildRequires:	java(JSR109)
 BuildRequires:	java-geronimo-spec-jaxrpc
 %endif
+BuildRequires:	java-jdbc-mysql
+BuildRequires:	java-mail
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
@@ -59,16 +53,19 @@ Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
+Requires:	java(jaxp_parser_impl)
+Requires:	java(jndi) >= 1.2.1
 Requires:	java-%{name}-catalina = %{epoch}:%{version}-%{release}
 Requires:	java-%{name}-coyote = %{epoch}:%{version}-%{release}
 Requires:	java-%{name}-jasper = %{epoch}:%{version}-%{release}
 Requires:	java-commons-dbcp-tomcat5 >= 0:1.1
 Requires:	java-commons-pool-tomcat5
 Requires:	java-jdbc-mysql
+Requires:	java-mail
 Requires:	java-servletapi = %{epoch}:%{version}-%{release}
-Requires:	java-sun-jre >= 1.2
-Requires:	jaxp_parser_impl
-Requires:	jndi >= 1.2.1
+Requires:	jpackage-utils
+Requires:	jre >= 1.2
+Requires:	jsvc
 Requires:	rc-scripts
 Suggests:	tomcat-native
 Provides:	group(servlet)
@@ -82,7 +79,6 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_tomcatdir	%{_datadir}/tomcat
 %define 	_logdir		%{_var}/log
 %define		_vardir		%{_var}/lib/tomcat
-%define		_sysconfdir	/etc/tomcat
 
 %define find_jar() %{expand:%%define jarfile {%(jar=$(find-jar %1); echo ${jar:-%%nil})}}%{?jarfile}%{!?jarfile:%{error:find-jar %1 failed}}%{nil}
 
@@ -190,7 +186,7 @@ send back a response to the requesting client.
 Summary:	JSP compiler
 Summary(pl.UTF-8):	Kompilator JSP
 Group:		Libraries/Java
-Requires:	eclipse-jdt >= 3.2
+Requires:	java-eclipse-jdt >= 3.2
 Requires:	jpackage-utils
 Obsoletes:	apache-tomcat-jasper
 Obsoletes:	tomcat-jasper
@@ -207,8 +203,9 @@ servletów Apache Tomcat.
 Summary:	Java servlet and JSP implementation classes
 Summary(pl.UTF-8):	Klasy z implementacją Java Servlet i JSP
 Group:		Libraries/Java
-Provides:	java(JSP) = %{jspapiver}
-Provides:	java(Servlet) = %{servletapiver}
+Provides:	java(jsp) = %{jspapiver}
+Provides:	java(servlet) = %{servletapiver}
+Obsoletes:	jakarta-servletapi5
 Obsoletes:	java-servletapi5
 
 %description -n java-servletapi
@@ -222,21 +219,24 @@ javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext).
 
 %prep
 %setup -q -n apache-%{name}-%{version}-src
-
 %patch0 -p0
 %patch1 -p0
-%patch2 -p0
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 # we don't need those scripts
 rm bin/*.bat
 rm bin/{startup,shutdown}.sh
 
-cp %{SOURCE3} build.properties
+cp -a %{SOURCE3} build.properties
 
 %build
 TOPDIR=$(pwd)
 
-%ant -Drpm.javadir=%{_javadir} -Drpm.libdir=%{_libdir}
+%ant \
+	-Drpm.javadir=%{_javadir} \
+	-Drpm.libdir=%{_libdir}
 
 %if %{with javadoc}
 %ant -f dist.xml dist-javadoc
@@ -245,13 +245,12 @@ 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
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 cd output/build
@@ -259,6 +258,11 @@ cd output/build
 TOMCATDIR=$RPM_BUILD_ROOT%{_tomcatdir}
 CATALINADIR=$RPM_BUILD_ROOT/var/lib/tomcat
 
+# useful for constructing relative symlinks. Is there a better way?
+TOMCATDIRREV=$(echo %{_tomcatdir} | sed 's#[^/]\+#..#g;s#^/##')
+CATALINADIRREV=$(echo /var/lib/tomcat | sed 's#[^/]\+#..#g;s#^/##')
+SYSCONFDIRREV=$(echo %{_sysconfdir} | sed 's#[^/]\+#..#g;s#^/##')
+
 install -d $TOMCATDIR \
 	    $CATALINADIR/temp \
 	    $RPM_BUILD_ROOT%{_vardir}/webapps \
@@ -268,25 +272,25 @@ install -d $TOMCATDIR \
 	    $RPM_BUILD_ROOT/etc/sysconfig \
 	    $RPM_BUILD_ROOT/etc/rc.d/init.d
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/tomcat
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/tomcat
 
 cp -a conf/* $CATALINADIR/conf
 install -d $CATALINADIR/conf/Catalina/localhost
-install %{SOURCE10} $CATALINADIR/conf/Catalina/localhost/ROOT.xml
-install %{SOURCE11} $CATALINADIR/conf/Catalina/localhost/docs.xml
-install %{SOURCE12} $CATALINADIR/conf/Catalina/localhost/manager.xml
-install %{SOURCE13} $CATALINADIR/conf/Catalina/localhost/host-manager.xml
-install %{SOURCE14} $CATALINADIR/conf/Catalina/localhost/examples.xml
+cp -a %{SOURCE10} $CATALINADIR/conf/Catalina/localhost/ROOT.xml
+cp -a %{SOURCE11} $CATALINADIR/conf/Catalina/localhost/docs.xml
+cp -a %{SOURCE12} $CATALINADIR/conf/Catalina/localhost/manager.xml
+cp -a %{SOURCE13} $CATALINADIR/conf/Catalina/localhost/host-manager.xml
+cp -a %{SOURCE14} $CATALINADIR/conf/Catalina/localhost/examples.xml
 
 cp -a bin lib webapps $TOMCATDIR
 cp -a temp $CATALINADIR
 
-ln -sf %{_logdir}/tomcat $CATALINADIR/logs
-ln -sf %{_logdir}/tomcat $TOMCATDIR/logs
-ln -sf %{_vardir}/work $TOMCATDIR/work
-ln -sf %{_vardir}/conf $TOMCATDIR/conf
-ln -sf %{_vardir}/conf $RPM_BUILD_ROOT%{_sysconfdir}
+ln -sf $CATALINADIRREV%{_logdir}/tomcat $CATALINADIR/logs
+ln -sf $TOMCATDIRREV%{_logdir}/tomcat $TOMCATDIR/logs
+ln -sf $TOMCATDIRREV%{_vardir}/work $TOMCATDIR/work
+ln -sf $TOMCATDIRREV%{_vardir}/conf $TOMCATDIR/conf
+ln -sf $SYSCONFDIRREV%{_vardir}/conf $RPM_BUILD_ROOT%{_sysconfdir}/tomcat
 
 # symlinks instead of copies
 jars="commons-daemon commons-logging-api"
@@ -295,7 +299,7 @@ for jar in $jars; do
 	ln -sf $jar $TOMCATDIR/bin
 done
 
-jars="commons-pool-tomcat5 commons-dbcp-tomcat5 mysql-connector-java org.eclipse.jdt.core"
+jars="commons-pool-tomcat5 commons-dbcp-tomcat5 mysql-connector-java org.eclipse.jdt.core mail"
 for jar in $jars; do
 	jar=$(find-jar $jar)
 	ln -sf $jar $TOMCATDIR/lib
@@ -315,8 +319,8 @@ ln -s servlet-api-%{servletapiver}.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api.ja
 ln -sf %{_javadir}/jasper-el.jar $TOMCATDIR/lib
 ln -sf %{_javadir}/jasper.jar $TOMCATDIR/lib
 
-ln -sf %{_javadir}/jsp-api-%{jspapiver}.jar $TOMCATDIR/lib
-ln -sf %{_javadir}/servlet-api-%{servletapiver}.jar $TOMCATDIR/lib
+ln -sf %{_javadir}/jsp-api-%{jspapiver}.jar $TOMCATDIR/lib/jsp-api.jar
+ln -sf %{_javadir}/servlet-api-%{servletapiver}.jar $TOMCATDIR/lib/servlet-api.jar
 
 ln -sf %{_javadir}/tomcat6-catalina.jar $TOMCATDIR/lib/catalina.jar
 ln -sf %{_javadir}/tomcat6-coyote.jar $TOMCATDIR/lib/tomcat-coyote.jar
@@ -358,7 +362,7 @@ fi
 %doc KEYS RELEASE-NOTES RELEASE-PLAN-6.0.txt RUNNING.txt
 %attr(754,root,root) /etc/rc.d/init.d/tomcat
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/tomcat
-%{_sysconfdir}
+%{_sysconfdir}/tomcat
 %dir %{_tomcatdir}
 %dir %{_tomcatdir}/conf
 %dir %{_tomcatdir}/bin
@@ -376,10 +380,11 @@ fi
 %{_tomcatdir}/lib/el-api.jar
 %{_tomcatdir}/lib/jasper-el.jar
 %{_tomcatdir}/lib/jasper.jar
-%{_tomcatdir}/lib/jsp-api-2.1.jar
+%{_tomcatdir}/lib/jsp-api.jar
+%{_tomcatdir}/lib/mail.jar
 %{_tomcatdir}/lib/mysql-connector-java.jar
 %{_tomcatdir}/lib/org.eclipse.jdt.core.jar
-%{_tomcatdir}/lib/servlet-api-2.5.jar
+%{_tomcatdir}/lib/servlet-api.jar
 %{_tomcatdir}/lib/tomcat-coyote.jar
 %{_tomcatdir}/lib/tomcat-i18n-es.jar
 %{_tomcatdir}/lib/tomcat-i18n-fr.jar