rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1 +
spacewalk/package/spacewalk.spec | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 9cf0c7cc7b6de6354639cb509fab9d0b52169bb4
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jan 31 16:00:22 2011 +0100
add jabberd-selinux-workaround to RHEL-6 comps
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
index 3acb80a..313619d 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -14,6 +14,7 @@
<packagereq type="default">chameleon</packagereq>
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">eventReceivers</packagereq>
+ <packagereq
type="default">jabberd-selinux-workaround</packagereq>
<packagereq type="default">jpam</packagereq>
<packagereq type="default">MessageQueue</packagereq>
<packagereq type="default">nocpulse-common</packagereq>
commit 9ab47d2dfa9b035be17c6fd3111bcb139f2656ac
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jan 31 15:58:57 2011 +0100
Require jabberd-selinux-workaround on RHEL-6.0
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index 86bdda6..f047c92 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -77,11 +77,14 @@ Requires: osa-dispatcher-selinux
Requires: spacewalk-monitoring-selinux
Requires: spacewalk-selinux
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%else
-# Fedoras 11+ have their own selinux policy for jabberd:
+%if 0%{?rhel} == 5
Requires: jabberd-selinux
%endif
+# Work around for jabberd to work with stock RHEL-6.0 SELinux policy
+%if 0%{?rhel} == 6
+Requires: jabberd-selinux-workaround
+%endif
+
Requires: editarea >= 0.8.2-2
Show replies by date