backend/satellite_tools/spacewalk-debug | 14 ++++++++------
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit d174e420ec63c36bc263d0c757eee0a42cde7afc
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 16:13:05 2010 +0100
Automatic commit of package [spacewalk-java] release [0.9.11-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3062142..fa0fb47 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.9.10
+Version: 0.9.11
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -310,6 +310,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Mar 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.9.11-1
+- fixed Requires for tomcat6
+- test case fix for SystemHandlerTest
+
* Mon Mar 22 2010 Tomas Lestach <tlestach(a)redhat.com> 0.9.10-1
- 575796 - make system.get_name API call faster (tlestach(a)redhat.com)
- 529359 - attempting to fix issue where solaris packages couldnt be installed,
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1083e55..17fb0d6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.9.10-1 java/
+0.9.11-1 java/
commit 47d3d4acd3bcf1a92d2d990ab620ca53d3f211de
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 15:52:15 2010 +0100
added packages no more automaticaly required in tomcat6
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 98c4ac7..3062142 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -37,6 +37,7 @@ Requires: java-devel >= 0:1.6.0
Requires: jakarta-commons-lang >= 0:2.1
Requires: jakarta-commons-codec
Requires: jakarta-commons-cli
+Requires: jakarta-commons-el
Requires: jakarta-commons-io
Requires: jakarta-commons-logging
Requires: jakarta-taglibs-standard
@@ -77,6 +78,7 @@ BuildRequires: tanukiwrapper
%if 0%{?rhel} && 0%{?rhel} < 5
BuildRequires: javamail
%else
+Requires: classpathx-mail
BuildRequires: classpathx-mail
%endif
BuildRequires: jsp
commit d6cf9bca1bdb01fc9904d1c150db6fbaa459496d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Mar 24 13:43:53 2010 +0100
added tomcat6
diff --git a/backend/satellite_tools/spacewalk-debug
b/backend/satellite_tools/spacewalk-debug
index 0d6d9dd..457c671 100755
--- a/backend/satellite_tools/spacewalk-debug
+++ b/backend/satellite_tools/spacewalk-debug
@@ -115,12 +115,14 @@ if [ -d /etc/jabberd ]; then
fi
# tomcat for spacewalk 400+
-if [ -d /etc/tomcat5 ]; then
- cp -fapRd /etc/tomcat5 $DIR/conf/tomcat
-fi
-if [ -d /var/log/tomcat5 ]; then
- cp -fapRd /var/log/tomcat5 $DIR/tomcat-logs
-fi
+for tomcat in tomcat5 tomcat6 ; do
+ if [ -d /etc/$tomcat ]; then
+ cp -fapRd /etc/$tomcat $DIR/conf/tomcat
+ fi
+ if [ -d /var/log/$tomcat ]; then
+ cp -fapRd /var/log/$tomcat $DIR/tomcat-logs
+ fi
+done
#entitlement report
if [ -e /usr/share/rhn/satellite_tools/rhn-entitlement-report.py ]; then