also rotate catalina.out

[packages/tomcat.git] / tomcat.spec

diff --git a/tomcat.spec b/tomcat.spec
index bc3b5ce536dc56d3e7cf44542990e4afd373aa13..d2a68ce0519b3be2b0f62b6d25d5208c299146e3 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -5,19 +5,21 @@
 %define                jspapiver       2.2
 %define                servletapiver   3.0
 
+%define                tomcatnatver    1.1.27
+
 # Java Commons Logging version. Must be >= 1.1.
-%define                jclver  1.1.1
+%define                jclver  1.1.3
 
 %include       /usr/lib/rpm/macros.java
 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.41
-Release:       8
+Version:       7.0.52
+Release:       3
 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: 8f1312436629c914564f3e8d88237be3
+# Source0-md5: 1b85c08721ab9d891b72ca35cd4a0e2d
 Source1:       apache-%{name}.init
 Source2:       apache-%{name}.sysconfig
 Source3:       %{name}-build.properties
@@ -27,8 +29,9 @@ Source12:     %{name}-context-manager.xml
 Source13:      %{name}-context-host-manager.xml
 Source14:      %{name}-context-examples.xml
 Source15:      %{name}.logrotate
+Source16:      log4j.properties
 Source100:     http://www.apache.org/dist/commons/logging/source/commons-logging-%{jclver}-src.tar.gz
-# Source100-md5:       e5cfa8cca13152d7545fde6b1783c60a
+# Source100-md5:       e8e197d628436490886d17cffa108fe3
 Patch0:                %{name}-build.xml.patch
 Patch1:                server.xml-URIEncoding-utf8.patch
 Patch2:                %{name}-LDAPUserDatabase.patch
@@ -52,8 +55,9 @@ BuildRequires:        java-log4j
 BuildRequires: java-mail
 BuildRequires: jdk
 BuildRequires: jpackage-utils
+BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpm-javaprov
-BuildRequires: rpmbuild(macros) >= 1.553
+BuildRequires: rpmbuild(macros) >= 1.657
 BuildRequires: sed >= 4.0
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
@@ -77,12 +81,16 @@ Requires:   jre >= 1.2
 Requires:      jsvc
 Requires:      rc-scripts
 Suggests:      logrotate
-Suggests:      tomcat-native >= 1.1.27
+Suggests:      tomcat-native >= %{tomcatnatver}
 Provides:      group(servlet)
 Provides:      group(tomcat)
 Provides:      user(tomcat)
 Obsoletes:     apache-tomcat
 Obsoletes:     jakarta-tomcat
+%if "%{pld_release}" != "ac"
+Conflicts:     logrotate < 3.8.0
+%endif
+Conflicts:     tomcat-native < %{tomcatnatver}
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -284,6 +292,7 @@ if test ! -e build.properties.local; then
        avalon-framework-api.jar=$(find-jar avalon-framework-api.jar)
        servletapi.jar=$(pwd)/output/build/lib/servlet-api.jar
        commons-logging.version=%{jclver}
+       java.7.home=%{java_home}
        EOF
        cat build.properties.local >> build.properties
 fi
@@ -340,6 +349,10 @@ cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/Catalina/localhost/manag
 cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/Catalina/localhost/host-manager.xml
 cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/Catalina/localhost/examples.xml
 cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+%if "%{pld_release}" == "ac"
+%{__sed} -i -e '/su/d' $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+%endif
+cp -p %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 cp -a bin lib webapps $TOMCATDIR
 cp -a temp $CATALINADIR
@@ -459,7 +472,7 @@ fi
 %dir %{_sysconfdir}/%{name}/Catalina/localhost
 # tomcat config has to be writeable because of tomcat-users.xml file and Catalina dir
 %config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/catalina.policy
-%config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.properties*
+%config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.properties
 %config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.xml
 
 %config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/Catalina/localhost/ROOT.xml
@@ -494,6 +507,8 @@ fi
 %{_tomcatdir}/lib/tomcat-i18n-es.jar
 %{_tomcatdir}/lib/tomcat-i18n-fr.jar
 %{_tomcatdir}/lib/tomcat-i18n-ja.jar
+%{_tomcatdir}/lib/tomcat7-websocket.jar
+%{_tomcatdir}/lib/websocket-api.jar
 %{_tomcatdir}/lib/util.jar
 
 %dir %{_tomcatdir}/webapps