client/tools/spacewalk-koan/spacewalk-koan.spec | 7 ++++++-
rel-eng/packages/spacewalk-koan | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 20f332ca0a2858228baba2acd97078ff8240b964
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 29 11:18:31 2010 +0200
Automatic commit of package [spacewalk-koan] release [0.2.14-1].
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec
b/client/tools/spacewalk-koan/spacewalk-koan.spec
index a24dea6..a00b7e3 100644
--- a/client/tools/spacewalk-koan/spacewalk-koan.spec
+++ b/client/tools/spacewalk-koan/spacewalk-koan.spec
@@ -3,7 +3,7 @@ Name: spacewalk-koan
Group: System Environment/Kernel
License: GPLv2
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.2.13
+Version: 0.2.14
Release: 1%{?dist}
BuildArch : noarch
URL:
https://fedorahosted.org/spacewalk
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/rhn/actions/
%changelog
+* Fri Oct 29 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.2.14-1
+- spacewalk-koan should conflict with all rhn-kickstart subpackages
+
* Mon Oct 25 2010 Jan Pazdziora 0.2.13-1
- 645795 - changing spaceawlk-koan to use subproccess only if it is available
and to fall back to popen2 if its not, this enables RHEL 4 support again
diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan
index 1a391ed..580a3e7 100644
--- a/rel-eng/packages/spacewalk-koan
+++ b/rel-eng/packages/spacewalk-koan
@@ -1 +1 @@
-0.2.13-1 client/tools/spacewalk-koan/
+0.2.14-1 client/tools/spacewalk-koan/
commit 67d954851281e116e7e868e757cf09c416834b56
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Oct 29 11:15:40 2010 +0200
spacewalk-koan should conflict with all rhn-kickstart subpackages
diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec
b/client/tools/spacewalk-koan/spacewalk-koan.spec
index e02e68f..a24dea6 100644
--- a/client/tools/spacewalk-koan/spacewalk-koan.spec
+++ b/client/tools/spacewalk-koan/spacewalk-koan.spec
@@ -14,6 +14,8 @@ Requires: python >= 1.5
Requires: koan >= 1.4.3
Conflicts: rhn-kickstart
+Conflicts: rhn-kickstart-common
+Conflicts: rhn-kickstart-virtualization
#this currently doesn't work for RHEL 2.1
%if 0%{?rhel} && 0%{?rhel} < 5