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/packages/cobbler20 | 2 +- rel-eng/packages/spacewalk | 2 +- spacewalk/package/spacewalk.spec | 8 ++++++-- spec-tree/cobbler20/cobbler20.spec | 19 +++++++++++++++++-- 8 files changed, 29 insertions(+), 6 deletions(-)
New commits: commit 792b30b570a7fbfd3588be9488641a3726ac51d0 Author: Jan Pazdziora jpazdziora@redhat.com Date: Fri Oct 19 11:20:01 2012 +0200
Automatic commit of package [spacewalk] release [1.8.4-1].
diff --git a/rel-eng/packages/spacewalk b/rel-eng/packages/spacewalk index bd88036..5b59ec6 100644 --- a/rel-eng/packages/spacewalk +++ b/rel-eng/packages/spacewalk @@ -1 +1 @@ -1.8.3-1 spacewalk/package/ +1.8.4-1 spacewalk/package/ diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec index 3b6533c..c6b524f 100644 --- a/spacewalk/package/spacewalk.spec +++ b/spacewalk/package/spacewalk.spec @@ -1,7 +1,7 @@ %define release_name Smile
Name: spacewalk -Version: 1.8.3 +Version: 1.8.4 Release: 1%{?dist} Summary: Spacewalk Systems Management Application URL: https://fedorahosted.org/spacewalk @@ -176,6 +176,10 @@ rm -rf %{buildroot} %{_datadir}/spacewalk/setup/defaults.d/postgresql-backend.conf
%changelog +* Fri Oct 19 2012 Jan Pazdziora 1.8.4-1 +- We need one extra package in the dependency chain to prefer cobbler20 upon + fresh installation. + * Tue Oct 16 2012 Jan Pazdziora 1.8.3-1 - Require the cobbler20 for full installation.
commit 49574cbe801e680e3b1ceaa740c7928ae564bac5 Author: Jan Pazdziora jpazdziora@redhat.com Date: Fri Oct 19 11:19:52 2012 +0200
Automatic commit of package [cobbler20] minor release [2.0.11-4].
diff --git a/rel-eng/packages/cobbler20 b/rel-eng/packages/cobbler20 index beaa45c..6670c94 100644 --- a/rel-eng/packages/cobbler20 +++ b/rel-eng/packages/cobbler20 @@ -1 +1 @@ -2.0.11-3 spec-tree/cobbler20/ +2.0.11-4 spec-tree/cobbler20/ diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec index bb895ba..b4fb15f 100644 --- a/spec-tree/cobbler20/cobbler20.spec +++ b/spec-tree/cobbler20/cobbler20.spec @@ -7,7 +7,7 @@ Name: cobbler20 License: GPLv2+ AutoReq: no Version: 2.0.11 -Release: 3%{?dist} +Release: 4%{?dist} Source0: cobbler-%{version}.tar.gz Group: Applications/System Requires: python >= 2.3 @@ -425,6 +425,10 @@ Web interface for Cobbler that allows visiting http://server/cobbler_web to conf %doc AUTHORS COPYING CHANGELOG README
%changelog +* Fri Oct 19 2012 Jan Pazdziora 2.0.11-4 +- We need one extra package in the dependency chain to prefer cobbler20 upon + fresh installation. + * Tue Oct 16 2012 Jan Pazdziora 2.0.11-3 - Compatibility package to provide cobbler 2.0.
commit 7c0ad73ec1353408934bf557446e982565bcf671 Author: Jan Pazdziora jpazdziora@redhat.com Date: Fri Oct 19 11:19:28 2012 +0200
Adding cobbler2 to composes.
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/comps/comps-spacewalk-server-fedora16.xml index 8406e6a..502418e 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora16.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml @@ -19,6 +19,7 @@ <packagereq type="default">rhn-client-tools</packagereq> <packagereq type="default">yum-rhn-plugin</packagereq>
+ <packagereq type="default">cobbler2</packagereq> <packagereq type="default">cobbler20</packagereq> <packagereq type="default">cobbler-epel</packagereq> <packagereq type="default">cx_Oracle</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-fedora17.xml b/rel-eng/comps/comps-spacewalk-server-fedora17.xml index 9eecbbf..07c9b11 100644 --- a/rel-eng/comps/comps-spacewalk-server-fedora17.xml +++ b/rel-eng/comps/comps-spacewalk-server-fedora17.xml @@ -19,6 +19,7 @@ <packagereq type="default">rhn-client-tools</packagereq> <packagereq type="default">yum-rhn-plugin</packagereq>
+ <packagereq type="default">cobbler2</packagereq> <packagereq type="default">cobbler20</packagereq> <packagereq type="default">cobbler-epel</packagereq> <packagereq type="default">cx_Oracle</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml index a8c73ac..193226a 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml @@ -27,6 +27,7 @@ <packagereq type="default">cglib-demo</packagereq> <packagereq type="default">cglib-nohook</packagereq> <packagereq type="default">cglib-repolib</packagereq> + <packagereq type="default">cobbler2</packagereq> <packagereq type="default">cobbler20</packagereq> <packagereq type="default">cobbler-epel</packagereq> <packagereq type="default">concurrent</packagereq> diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml index a32f478..c32b2d3 100644 --- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml +++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml @@ -19,6 +19,7 @@ <packagereq type="default">rhn-client-tools</packagereq> <packagereq type="default">yum-rhn-plugin</packagereq>
+ <packagereq type="default">cobbler2</packagereq> <packagereq type="default">cobbler20</packagereq> <packagereq type="default">cobbler-epel</packagereq> <packagereq type="default">cx_Oracle</packagereq>
commit bdb65c4b471a30786087e36af0988fcea9c232b1 Author: Jan Pazdziora jpazdziora@redhat.com Date: Fri Oct 19 11:04:21 2012 +0200
We need one extra package in the dependency chain to prefer cobbler20 upon fresh installation.
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec index f983828..3b6533c 100644 --- a/spacewalk/package/spacewalk.spec +++ b/spacewalk/package/spacewalk.spec @@ -86,7 +86,7 @@ Requires: selinux-policy-base >= 3.7.19-93
Requires: editarea >= 0.8.2-2
-Requires: cobbler20 +Requires: cobbler2
%description common Spacewalk is a systems management application that will diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec index 863c79e..bb895ba 100644 --- a/spec-tree/cobbler20/cobbler20.spec +++ b/spec-tree/cobbler20/cobbler20.spec @@ -361,11 +361,22 @@ of an existing system. For use with a boot-server configured with Cobbler %dir /var/log/koan %doc AUTHORS COPYING CHANGELOG README
+%package -n cobbler2 +Summary: Compatibility package to pull in cobbler from Spacewalk repo +Group: Applications/System +Requires: cobbler20 = %{version}-%{release} + +%description -n cobbler2 + +Compatibility package to pull in cobbler from Spacewalk repo. + +%files -n cobbler2 + %package -n cobbler-epel Summary: Compatibility package to pull in cobbler package from EPEL/Fedora Group: Applications/System Requires: cobbler >= 2.2 -Provides: cobbler20 +Provides: cobbler2
%description -n cobbler-epel
spacewalk-commits@lists.fedorahosted.org