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: 7.0.20
-Release: 1
+Version: 7.0.41
+Release: 2.1
License: Apache v2.0
Group: Networking/Daemons/Java
Source0: http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
-# Source0-md5: bb13b2910cc71c29e571ea062ad6ab3a
+# Source0-md5: 8f1312436629c914564f3e8d88237be3
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
Source12: %{name}-context-manager.xml
Source13: %{name}-context-host-manager.xml
Source14: %{name}-context-examples.xml
+Source15: %{name}.logrotate
Source100: http://www.apache.org/dist/commons/logging/source/commons-logging-%{jclver}-src.tar.gz
# Source100-md5: e5cfa8cca13152d7545fde6b1783c60a
Patch0: %{name}-build.xml.patch
Patch2: %{name}-LDAPUserDatabase.patch
Patch3: %{name}-catalina.policy-javadir.patch
Patch4: %{name}-userdir.patch
+Patch5: logging.patch
Patch100: jcl-build.xml.patch
URL: http://tomcat.apache.org/
BuildRequires: ant >= 1.5.3
-BuildRequires: ant-trax
-BuildRequires: eclipse-jdt >= 3.2
+BuildRequires: eclipse-jdt >= 4.2.2
BuildRequires: java(JSR109)
BuildRequires: java-avalon-logkit
BuildRequires: java-commons-daemon >= 1.0
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-%{name}-catalina = %{version}-%{release}
+Requires: java-%{name}-coyote = %{version}-%{release}
+Requires: java-%{name}-jasper = %{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-servletapi = %{version}-%{release}
Requires: jpackage-utils
Requires: jre >= 1.2
Requires: jsvc
Requires: rc-scripts
-Suggests: tomcat-native
+Suggests: logrotate
+Suggests: tomcat-native >= 1.1.27
Provides: group(servlet)
Provides: group(tomcat)
Provides: user(tomcat)
Summary: The Apache Tomcat Servlet/JSP application manager
Summary(pl.UTF-8): Zarządca aplikacji w Tomcacie
Group: Networking/Daemons/Java/Servlets
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description webapp-manager
The Apache Tomcat Servlet/JSP application manager.
Summary: The Apache Tomcat Servlet/JSP virtual hosts manager
Summary(pl.UTF-8): Zarządca wirtualnych hostów w Tomcacie
Group: Networking/Daemons/Java/Servlets
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Obsoletes: tomcat-admin
%description webapp-host-manager
Summary: The Apache Tomcat Servlet/JSP example applications
Summary(pl.UTF-8): Przykładowe aplikacje dla Tomcata
Group: Networking/Daemons/Java/Servlets
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description webapp-examples
The Apache Tomcat Servlet/JSP example applications.
Summary: Web Services support (JSR 109)
Summary(pl.UTF-8): Wsparcie dla Web Services (JSR 109)
Group: Libraries/Java
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: java(JSR109)
Requires: java-geronimo-spec-jaxrpc
Summary: JMX remote interface for Tomcat
Summary(pl.UTF-8): Zdalny interfejs JMX dla Tomcata
Group: Libraries/Java
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description jmx
JMX remote interface for Tomcat.
Summary: JSP compiler
Summary(pl.UTF-8): Kompilator JSP
Group: Libraries/Java
-Requires: java-eclipse-jdt >= 3.2
+Requires: java-eclipse-jdt >= 4.2.2
Requires: jpackage-utils
Obsoletes: apache-tomcat-jasper
Obsoletes: tomcat-jasper
Provides: java(jsp) = %{jspapiver}
Provides: java(servlet) = %{servletapiver}
Obsoletes: jakarta-servletapi5
-Obsoletes: java-servletapi5
Obsoletes: jakarta-servletapi5
+Obsoletes: java-servletapi5
%description -n java-servletapi
Implementation classes of the Java Servlet and JSP APIs (packages
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
# Prepare java-commmons-logging sources
mkdir -p output/extras/logging
avalon-framework-impl.jar=%(find-jar avalon-framework-impl.jar)
avalon-framework-api.jar=%(find-jar avalon-framework-api.jar)
servletapi.jar=$(pwd)/output/build/lib/servlet-api.jar
+commons-logging.version=%{jclver}
EOF
%build
$RPM_BUILD_ROOT%{_vardir}/work \
$RPM_BUILD_ROOT%{_vardir}/conf \
$RPM_BUILD_ROOT%{_logdir}/tomcat \
- $RPM_BUILD_ROOT/etc/sysconfig \
- $RPM_BUILD_ROOT/etc/rc.d/init.d
+ $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d,logrotate.d}
install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/tomcat
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 -p %{SOURCE15} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
cp -a bin lib webapps $TOMCATDIR
cp -a temp $CATALINADIR
%doc KEYS RELEASE-NOTES
%attr(754,root,root) /etc/rc.d/init.d/tomcat
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/tomcat
+%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
%{_sysconfdir}/tomcat
%dir %{_tomcatdir}
%dir %{_tomcatdir}/conf
%{_tomcatdir}/lib/mysql-connector-java.jar
%{_tomcatdir}/lib/org.eclipse.jdt.core.jar
%{_tomcatdir}/lib/servlet-api.jar
+%{_tomcatdir}/lib/tomcat-jdbc.jar
%{_tomcatdir}/lib/tomcat-coyote.jar
%{_tomcatdir}/lib/tomcat-i18n-es.jar
%{_tomcatdir}/lib/tomcat-i18n-fr.jar
projects / packages / tomcat.git / blobdiff