up to 7.0.63, build still fails

[packages/tomcat.git] / tomcat.spec

diff --git a/tomcat.spec b/tomcat.spec
index 682addceb0998a68f2017a395445198708b3c189..50f272ea52843e0d0807123fec7f0591d1e63246 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -14,12 +14,12 @@
 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.52
-Release:       2
+Version:       7.0.63
+Release:       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: 1b85c08721ab9d891b72ca35cd4a0e2d
+# Source0-md5: 29fbc490b99140a671e4c84d152caee7
 Source1:       apache-%{name}.init
 Source2:       apache-%{name}.sysconfig
 Source3:       %{name}-build.properties
@@ -53,10 +53,11 @@ BuildRequires:      java-jdbc-mysql
 BuildRequires: java-junit
 BuildRequires: java-log4j
 BuildRequires: java-mail
-BuildRequires: jdk
+BuildRequires: jdk >= 1.6
 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
@@ -86,7 +87,9 @@ 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)
@@ -346,6 +349,9 @@ 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