summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavid knox <dknox@78-97-42-72.skybeam.com>2011-02-28 15:53:47 -0700
committerdavid knox <dknox@78-97-42-72.skybeam.com>2011-02-28 15:53:47 -0700
commiteea1f30f107f83f4298743d4fc7502bcdb9170c6 (patch)
treea95dcfbe3b6a5351da62ce8f8da5251e61ffd9b9
parent3cb34c719a6e6042afb64eb8f76a391c8c67cb48 (diff)
parentb6cdbc0ffa6fbd7e741f710740ffba427db3e346 (diff)
downloadtomcat-eea1f30f107f83f4298743d4fc7502bcdb9170c6.tar.gz
tomcat-eea1f30f107f83f4298743d4fc7502bcdb9170c6.tar.xz
tomcat-eea1f30f107f83f4298743d4fc7502bcdb9170c6.zip
merged auto message with current build
-rw-r--r--tomcat6.spec11
1 files changed, 7 insertions, 4 deletions
diff --git a/tomcat6.spec b/tomcat6.spec
index 18cceb0..575bc7e 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -273,7 +273,6 @@ zip -u output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir}
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir}
/bin/touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out
-chmod 775 ${RPM_BUILD__ROOT}%{logdir}/catalina.out
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir}
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir}
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir}
@@ -567,10 +566,14 @@ fi
%{appdir}/sample
%changelog
-* Mon Feb 7 2011 David Knox <dknox@redhat.com> 0:6.0.32-1
+* Mon Feb 28 2011 David Knox <dknox@redhat.com> 0:6.0.32-1
- Rebase on 6.0.32 with several bug fixes and security fixes
- changed apache-commons to jakarta-commons to fix missing
-- dependencies during install.
+- dependencies during install. Adjusted permissions on logs and
+- conf dirs so init worked. Reversed order of reading conf files
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:6.0.30-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Feb 3 2011 Alexander Kurtakov <akurtako@redhat.com> 0:6.0.30-1
- Update to 6.0.30.