rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 12 +++++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit aa9acff82b7fae7a15e119815874b49976672c00
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 19 11:28:58 2011 +0100
Automatic commit of package [spacewalk-web] release [1.3.21-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 8071a09..1162da3 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.3.20-1 web/
+1.3.21-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index ee8202c..2bd8502 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.20
+Version: 1.3.21
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -260,6 +260,11 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Jan 19 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.21-1
+- adding tomcat require to spacewalk-base-minimal (tlestach(a)redhat.com)
+- 670185 - rephrasing the status information to be more clear
+ (tlestach(a)redhat.com)
+
* Mon Jan 03 2011 Jan Pazdziora 1.3.20-1
- token_channel_select.js not referenced, removing.
- As RHN::DB::Search is gone, system_search_setbuilder.xml is not used,
commit add57807953522ebe3dc6c9a8b8b6d8512c5b55a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 19 11:25:33 2011 +0100
adding tomcat require to spacewalk-base-minimal
adressing: warning: group apache does not exist - using root
when installing spacewalk-base-minimal
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 326ecec..ee8202c 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -50,6 +50,11 @@ database. This includes RHN::* and RHN::DB::*
Summary: Minimal .pm's for %{name} package
Group: Applications/Internet
Provides: spacewalk(spacewalk-base-minimal) = %{version}-%{release}
+%if (0%{?rhel} < 6) || (0%{?fedora} < 13)
+Requires: tomcat5
+%else
+Requires: tomcat6
+%endif
Obsoletes: rhn-base-minimal < 5.3.0
Provides: rhn-base-minimal = 5.3.0