java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java | 9 +++++++++
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 445b8211068d3621c10ce71a8e876ef5237cdef0
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Dec 18 14:21:32 2013 -0500
Automatic commit of package [spacewalk-java] release [2.1.105-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 1f4a9a4..e639320 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.104
+Version: 2.1.105
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Dec 18 2013 Stephen Herr <sherr(a)redhat.com> 2.1.105-1
+- 1044547 - kickstarts to RHEL 7 don't work because of missing rpms
+
* Wed Dec 18 2013 Stephen Herr <sherr(a)redhat.com> 2.1.104-1
- 1039193 - fix checkstyle
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index bc20e3b..19563e4 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.104-1 java/
+2.1.105-1 java/
commit 02b94a12c35b7b63de4cc62326a6263d6251a950
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Dec 18 14:20:36 2013 -0500
1044547 - kickstarts to RHEL 7 don't work because of missing rpms
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
index 906e26e..b63b2fa 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartFormatter.java
@@ -575,6 +575,15 @@ public class KickstartFormatter {
buf.append("@ Network Support" + NEWLINE);
buf.append("openssh-server" + NEWLINE);
}
+
+ // packages necessary for RHEL 7
+ if (this.ksdata.isRhel7()) {
+ buf.append("perl");
+ buf.append("wget");
+ buf.append("rhn-setup");
+ buf.append("rhn-check");
+ buf.append("rhn-client-tools");
+ }
return buf.toString();
}