rel-eng/comps/comps-spacewalk-server-fedora16.xml | 1 + rel-eng/comps/comps-spacewalk-server-fedora17.xml | 1 + rel-eng/comps/comps-spacewalk-server-rhel5.xml | 1 + rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1 + rel-eng/tito.props | 8 ++++---- 5 files changed, 8 insertions(+), 4 deletions(-)
New commits: commit 38e49da7a51968a62903156f5b8c1c623a1fc589 Author: Jan Pazdziora jpazdziora@redhat.com Date: Tue Dec 11 13:18:59 2012 +0100
Put heirloom-pkgtools back to composes.
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/comps/comps-spacewalk-server-fedora16.xml index 3ce3ba9..5744239 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora16.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml @@ -25,6 +25,7 @@ <packagereq type="default">cx_Oracle</packagereq> <packagereq type="default">dwr</packagereq> <packagereq type="default">eventReceivers</packagereq> + <packagereq type="optional">heirloom-pkgtools</packagereq> <packagereq type="default">jpam</packagereq> <packagereq type="default">MessageQueue</packagereq> <packagereq type="default">nocpulse-common</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-fedora17.xml b/rel-eng/comps/comps-spacewalk-server-fedora17.xml index 3ce3ba9..5744239 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora17.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora17.xml @@ -25,6 +25,7 @@ <packagereq type="default">cx_Oracle</packagereq> <packagereq type="default">dwr</packagereq> <packagereq type="default">eventReceivers</packagereq> + <packagereq type="optional">heirloom-pkgtools</packagereq> <packagereq type="default">jpam</packagereq> <packagereq type="default">MessageQueue</packagereq> <packagereq type="default">nocpulse-common</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml index 92e199a..6ea46ba 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml @@ -39,6 +39,7 @@ <packagereq type="default">dom4j-repolib</packagereq> <packagereq type="default">dwr</packagereq> <packagereq type="default">eventReceivers</packagereq> + <packagereq type="optional">heirloom-pkgtools</packagereq> <packagereq type="default">hibernate3</packagereq> <packagereq type="default">hibernate3-manual</packagereq> <packagereq type="default">hibernate3-repolib</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml index 8239386..ba80d1e 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml @@ -25,6 +25,7 @@ <packagereq type="default">cx_Oracle</packagereq> <packagereq type="default">dwr</packagereq> <packagereq type="default">eventReceivers</packagereq> + <packagereq type="optional">heirloom-pkgtools</packagereq> <packagereq type="default">jpam</packagereq> <packagereq type="default">MessageQueue</packagereq> <packagereq type="default">nocpulse-common</packagereq> diff --git a/rel-eng/tito.props b/rel-eng/tito.props index aab7e20..2bc79c1 100644 --- a/rel-eng/tito.props +++ b/rel-eng/tito.props @@ -10,16 +10,16 @@ autobuild_tags = spacewalk-nightly-rhel5 spacewalk-nightly-rhel6 spacewalk-night
[spacewalk-nightly-rhel5] disttag = .el5 -blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm heirloom-pkgtools oracle-rhnsat-selinux spacewalk-jpp-workaround apt-spacewalk python-hwdata spacewalk-oro-compat +blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm oracle-rhnsat-selinux spacewalk-jpp-workaround apt-spacewalk python-hwdata spacewalk-oro-compat
[spacewalk-nightly-rhel6] disttag = .el6 -blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm heirloom-pkgtools oracle-rhnsat-selinux jabberd-selinux apt-spacewalk python-hwdata spacewalk-oro-compat +blacklist=oracle-server-admin oracle-server-scripts rhnclient smartpm oracle-rhnsat-selinux jabberd-selinux apt-spacewalk python-hwdata spacewalk-oro-compat
[spacewalk-nightly-fedora16] disttag = .fc16 -blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata heirloom-pkgtools oracle-rhnsat-selinux +blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata oracle-rhnsat-selinux
[spacewalk-nightly-fedora17] disttag = .fc17 -blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata heirloom-pkgtools oracle-rhnsat-selinux +blacklist=jabberd-selinux oracle-server-admin oracle-server-scripts rhnclient smartpm apt-spacewalk python-hwdata oracle-rhnsat-selinux