[tomcat/el6] fixed bug 1080195
by Ivan Afonichev
commit 9661f8da0d7e82b63ef65ebe467e0eb103ae624f
Author: Vlad Selpukhin <slp.vld(a)gmail.com>
Date: Thu May 1 00:11:18 2014 +0400
fixed bug 1080195
tomcat-7.0.wrapper | 5 -----
tomcat.spec | 8 ++++++--
2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/tomcat-7.0.wrapper b/tomcat-7.0.wrapper
index 820c622..d6db6e8 100644
--- a/tomcat-7.0.wrapper
+++ b/tomcat-7.0.wrapper
@@ -16,11 +16,6 @@ if [ -r "$TOMCAT_CFG" ]; then
. $TOMCAT_CFG
fi
-# Get instance specific config file
-if [ -r "/etc/sysconfig/${NAME}" ]; then
- . /etc/sysconfig/${NAME}
-fi
-
set_javacmd
# CLASSPATH munging
if [ -n "$JSSE_HOME" ]; then
diff --git a/tomcat.spec b/tomcat.spec
index 2919271..67431be 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -53,7 +53,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -527,7 +527,7 @@ fi
%attr(0755,root,tomcat) %dir %{basedir}
%attr(0755,root,tomcat) %dir %{confdir}
%defattr(0664,root,tomcat,0770)
-%attr(0644,root,tomcat) %dir %{logdir}
+%attr(0770,root,tomcat) %dir %{logdir}
%attr(0660,tomcat,tomcat) %{logdir}/catalina.out
%attr(0644,tomcat,tomcat) %{_localstatedir}/run/%{name}.pid
%attr(0770,root,tomcat) %dir %{cachedir}
@@ -622,6 +622,10 @@ fi
%{_sbindir}/%{name}-jsvc
%changelog
+* Tue Apr 29 2014 Vlad Slepukhin <slp.vld(a)gmail.com> 0:7.0.33-4
+- Fixed bug not allowing Tomcat to start properly connected with access privleges to the logging directory
+- Removed residual systemd configuration from the wrapper
+
* Wed Feb 26 2014 Vlad Slepukhin <slp.vld(a)gmail.com> 0:7.0.33-3
- Changed ExclusiveArch to ExcludeArch due to bug appearing during build with this parameter
10 years, 1 month
[tycho] Non-bootstrap build.
by Alexander Kurtakov
commit 32cb24e4e06a399ba0d05da21e16ead722680278
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Apr 30 22:41:47 2014 +0300
Non-bootstrap build.
tycho.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index 1369ec2..a80183b 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -6,7 +6,7 @@
# This basically uses javac + xmvn to build only the Tycho components
# required to perform a full Tycho build
# Most common usage : A library (in Fedora) used by Tycho's runtime broke API
-%global tycho_bootstrap 1
+%global tycho_bootstrap 0
# Set 'eclipse_bootstrap' if Eclipse from buildroot cannot help build Tycho
# This basically provides a location for usage of pre-bundled Eclipse
# Possible uses : Need to build Tycho before Eclipse in fresh buildroot
@@ -19,7 +19,7 @@
Name: tycho
Version: 0.20.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -350,6 +350,9 @@ install -m 644 $osgiStateJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.compati
%{_javadocdir}/%{name}
%changelog
+* Wed Apr 30 2014 Alexander Kurtakov <akurtako(a)redhat.com> 0.20.0-5
+- Non-bootstrap build.
+
* Tue Apr 29 2014 Alexander Kurtakov <akurtako(a)redhat.com> 0.20.0-4
- Organize patches.
10 years, 1 month