- utf8 URIEncoding; rel 2

[packages/tomcat.git] / tomcat.spec

diff --git a/tomcat.spec b/tomcat.spec
index 9f772da93f4c88abef7f070708e15f4b2a985b60..90fdf1dab50cefa1ad978961fbb185fe6b22ef02 100644 (file)
--- 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.24
-Release:       1
+Version:       6.0.28
+Release:       2
 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: 543218290008e0dd6a329f69136973ca
+# Source0-md5: fb36ed47cb358006a29e1a86037356df
 Source1:       apache-%{name}.init
 Source2:       apache-%{name}.sysconfig
 Source3:       %{name}-build.properties
@@ -27,13 +26,8 @@ Source13:    %{name}-context-host-manager.xml
 Source14:      %{name}-context-examples.xml
 Patch0:                %{name}-build.xml.patch
 Patch1:                %{name}-extras.xml.patch
+Patch2:                server.xml-URIEncoding-utf8.patch
 URL:           http://tomcat.apache.org/
-%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
@@ -45,6 +39,8 @@ 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
@@ -55,16 +51,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)
@@ -203,8 +202,8 @@ 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:     java-servletapi5
 
 %description -n java-servletapi
@@ -218,20 +217,22 @@ javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext).
 
 %prep
 %setup -q -n apache-%{name}-%{version}-src
-
 %patch0 -p0
 %patch1 -p0
+%patch2 -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
@@ -246,7 +247,6 @@ ln -s %{_javadir}/jsr109.jar output/extras/webservices/wsdl4j.jar
 %ant -f extras.xml webservices
 %endif
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 cd output/build
@@ -263,16 +263,16 @@ 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
@@ -290,7 +290,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
@@ -372,6 +372,7 @@ fi
 %{_tomcatdir}/lib/jasper-el.jar
 %{_tomcatdir}/lib/jasper.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.jar