rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 10 ++++------
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit e4c6fa8cbf9d2cd92b80ef88d4602d9cd303f94f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jul 29 16:14:35 2011 +0200
Automatic commit of package [spacewalk-web] release [1.6.7-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 5ff0d3e..2e343f6 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.6-1 web/
+1.6.7-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 6825aa6..cbe6425 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.6.6
+Version: 1.6.7
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Jul 29 2011 Miroslav Suchý 1.6.7-1
+- Revert "adding tomcat require to spacewalk-base-minimal"
+
* Fri Jul 29 2011 Miroslav Suchý 1.6.6-1
- 705363 - remove obscure keys forgotten for ages
- 705363 - Escape percentage symbol in changelog
commit f4edcac95dc0ff7901bd57c8d5eaca4e9cdacba6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jul 29 16:11:31 2011 +0200
Revert "adding tomcat require to spacewalk-base-minimal"
This reverts commit add57807953522ebe3dc6c9a8b8b6d8512c5b55a.
I do not see sense of this commit and neither tlestach not anybody
else can explaint it. Reverting. If that warning will pop up again
we can do revert of this revert later.
Conflicts:
web/spacewalk-web.spec
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index cf87d05..6825aa6 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -54,11 +54,6 @@ database. This includes RHN::* and RHN::DB::*.
Summary: Core of Perl modules for %{name} package
Group: Applications/Internet
Provides: spacewalk(spacewalk-base-minimal) = %{version}-%{release}
-%if 0%{?rhel} && 0%{?rhel} < 6
-Requires: tomcat5
-%else
-Requires: tomcat6
-%endif
Requires: httpd
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo
$version))
Obsoletes: rhn-base-minimal < 5.3.0