rel-eng/packages/spacewalk-repo | 2
rel-eng/packages/spacewalk-utils | 2
spec-tree/spacewalk-repo/spacewalk-repo.spec | 8 ++-
utils/spacewalk-common-channels.ini | 62 +++++++++++++--------------
utils/spacewalk-utils.spec | 5 +-
5 files changed, 43 insertions(+), 36 deletions(-)
New commits:
commit 9f17807f94cecab4beced69c49c37275caa40f37
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 31 10:19:23 2012 +0100
Automatic commit of package [spacewalk-utils] release [1.8.33-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index cd09a90..0c138ef 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.8.32-1 utils/
+1.8.33-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 1706572..f02ab55 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.8.32
+Version: 1.8.33
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -86,6 +86,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Wed Oct 31 2012 Jan Pazdziora 1.8.33-1
+- Advertise the
yum.spacewalkproject.org.
+
* Tue Oct 30 2012 Jan Pazdziora 1.8.32-1
- Adding Spacewalk 1.8 to spacewalk-common-channels.
- Update the copyright year.
commit 819b50f37898133264fa7d54ab5cc5e3e7f16ee7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 31 10:17:39 2012 +0100
Advertise the
yum.spacewalkproject.org.
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index e44100a..91ef076 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -29,7 +29,7 @@ yum_repo_label = External yum repo - %(name)s
## now define some "macros"
_x86_archs = i386, x86_64
_centos4_archs = alpha, i386, ia64, s390, s390x, x86_64
-_spacewalk_gpgkey_url =
http://spacewalk.redhat.com/yum/RPM-GPG-KEY-spacewalk-2012
+_spacewalk_gpgkey_url =
http://yum.spacewalkproject.org/RPM-GPG-KEY-spacewalk-2012
_spacewalk_gpgkey_id = 430A1C35
_spacewalk_gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
@@ -338,7 +338,7 @@ base_channels = centos5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.7/RHEL/5/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.7/RHEL/5/%(arch)s/
[spacewalk17-server-centos6]
name = Spacewalk Server 1.7 for %(base_channel_name)s
@@ -347,7 +347,7 @@ base_channels = centos6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.7/RHEL/6/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.7/RHEL/6/%(arch)s/
[spacewalk17-server-scientific6]
name = Spacewalk Server 1.7 for %(base_channel_name)s
@@ -356,7 +356,7 @@ base_channels = scientific6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.7/RHEL/6/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.7/RHEL/6/%(arch)s/
[spacewalk17-server-fedora15]
name = Spacewalk Server 1.7 for %(base_channel_name)s
@@ -365,7 +365,7 @@ base_channels = fedora15-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.7/Fedora/15/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.7/Fedora/15/%(arch)s/
[spacewalk17-server-fedora16]
name = Spacewalk Server 1.7 for %(base_channel_name)s
@@ -374,7 +374,7 @@ base_channels = fedora16-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.7/Fedora/16/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.7/Fedora/16/%(arch)s/
[spacewalk17-client-centos5]
name = Spacewalk Client 1.7 for %(base_channel_name)s
@@ -383,7 +383,7 @@ base_channels = centos5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.7-client/RHEL/5/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.7-client/RHEL/5/%(arch)s/
[spacewalk17-client-centos6]
name = Spacewalk Client 1.7 for %(base_channel_name)s
@@ -392,7 +392,7 @@ base_channels = centos6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.7-client/RHEL/6/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.7-client/RHEL/6/%(arch)s/
[spacewalk17-client-scientific6]
name = Spacewalk Client 1.7 for %(base_channel_name)s
@@ -401,7 +401,7 @@ base_channels = scientific6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.7-client/RHEL/6/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.7-client/RHEL/6/%(arch)s/
[spacewalk17-client-fedora15]
name = Spacewalk Client 1.7 for %(base_channel_name)s
@@ -410,7 +410,7 @@ base_channels = fedora15-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.7-client/Fedora/15/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.7-client/Fedora/15/%(arch)s/
[spacewalk17-client-fedora16]
name = Spacewalk Client 1.7 for %(base_channel_name)s
@@ -419,7 +419,7 @@ base_channels = fedora16-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.7-client/Fedora/16/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.7-client/Fedora/16/%(arch)s/
[spacewalk18-server-centos5]
@@ -429,7 +429,7 @@ base_channels = centos5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.8/RHEL/5/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.8/RHEL/5/%(arch)s/
[spacewalk18-server-centos6]
name = Spacewalk Server 1.8 for %(base_channel_name)s
@@ -438,7 +438,7 @@ base_channels = centos6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.8/RHEL/6/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.8/RHEL/6/%(arch)s/
[spacewalk18-server-scientific6]
name = Spacewalk Server 1.8 for %(base_channel_name)s
@@ -447,7 +447,7 @@ base_channels = scientific6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.8/RHEL/6/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.8/RHEL/6/%(arch)s/
[spacewalk18-server-fedora16]
name = Spacewalk Server 1.8 for %(base_channel_name)s
@@ -456,7 +456,7 @@ base_channels = fedora16-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.8/Fedora/16/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.8/Fedora/16/%(arch)s/
[spacewalk18-server-fedora17]
name = Spacewalk Server 1.8 for %(base_channel_name)s
@@ -465,7 +465,7 @@ base_channels = fedora17-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.8/Fedora/17/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.8/Fedora/17/%(arch)s/
[spacewalk18-client-centos5]
name = Spacewalk Client 1.8 for %(base_channel_name)s
@@ -474,7 +474,7 @@ base_channels = centos5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.8-client/RHEL/5/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.8-client/RHEL/5/%(arch)s/
[spacewalk18-client-centos6]
name = Spacewalk Client 1.8 for %(base_channel_name)s
@@ -483,7 +483,7 @@ base_channels = centos6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.8-client/RHEL/6/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.8-client/RHEL/6/%(arch)s/
[spacewalk18-client-scientific6]
name = Spacewalk Client 1.8 for %(base_channel_name)s
@@ -492,7 +492,7 @@ base_channels = scientific6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.8-client/RHEL/6/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.8-client/RHEL/6/%(arch)s/
[spacewalk18-client-fedora16]
name = Spacewalk Client 1.8 for %(base_channel_name)s
@@ -501,7 +501,7 @@ base_channels = fedora16-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.8-client/Fedora/16/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.8-client/Fedora/16/%(arch)s/
[spacewalk18-client-fedora17]
name = Spacewalk Client 1.8 for %(base_channel_name)s
@@ -510,7 +510,7 @@ base_channels = fedora17-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/1.8-client/Fedora/17/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/1.8-client/Fedora/17/%(arch)s/
@@ -521,7 +521,7 @@ base_channels = centos5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/nightly/RHEL/5/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/nightly/RHEL/5/%(arch)s/
[spacewalk-nightly-server-centos6]
name = Spacewalk Server (N) for %(base_channel_name)s
@@ -530,7 +530,7 @@ base_channels = centos6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/nightly/RHEL/6/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/nightly/RHEL/6/%(arch)s/
[spacewalk-nightly-server-scientific6]
name = Spacewalk Server (N) for %(base_channel_name)s
@@ -539,7 +539,7 @@ base_channels = scientific6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/nightly/RHEL/6/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/nightly/RHEL/6/%(arch)s/
[spacewalk-nightly-server-fedora16]
name = Spacewalk Server (N) for %(base_channel_name)s
@@ -548,7 +548,7 @@ base_channels = fedora16-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/nightly/Fedora/16/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/nightly/Fedora/16/%(arch)s/
[spacewalk-nightly-server-fedora17]
name = Spacewalk Server (N) for %(base_channel_name)s
@@ -557,7 +557,7 @@ base_channels = fedora17-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/nightly/Fedora/17/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/nightly/Fedora/17/%(arch)s/
[spacewalk-nightly-client-centos5]
@@ -567,7 +567,7 @@ base_channels = centos5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/nightly-client/RHEL/5/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/nightly-client/RHEL/5/%(arch)s/
[spacewalk-nightly-client-centos6]
name = Spacewalk Client (N) for %(base_channel_name)s
@@ -576,7 +576,7 @@ base_channels = centos6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/nightly-client/RHEL/6/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/nightly-client/RHEL/6/%(arch)s/
[spacewalk-nightly-client-scientific6]
name = Spacewalk Client (N) for %(base_channel_name)s
@@ -585,7 +585,7 @@ base_channels = scientific6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/nightly-client/RHEL/6/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/nightly-client/RHEL/6/%(arch)s/
[spacewalk-nightly-client-fedora16]
name = Spacewalk Client (N) for %(base_channel_name)s
@@ -594,7 +594,7 @@ base_channels = fedora16-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/nightly-client/Fedora/16/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/nightly-client/Fedora/16/%(arch)s/
[spacewalk-nightly-client-fedora17]
name = Spacewalk Client (N) for %(base_channel_name)s
@@ -603,4 +603,4 @@ base_channels = fedora17-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url =
http://spacewalk.redhat.com/yum/nightly-client/Fedora/17/%(arch)s/
+yumrepo_url =
http://yum.spacewalkproject.org/nightly-client/Fedora/17/%(arch)s/
commit dcd725afa7df0836d1d0a0b4295be0e26e86d1fd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 31 10:18:46 2012 +0100
Automatic commit of package [spacewalk-repo] minor release [1.8-4].
diff --git a/rel-eng/packages/spacewalk-repo b/rel-eng/packages/spacewalk-repo
index c89193a..4413bb0 100644
--- a/rel-eng/packages/spacewalk-repo
+++ b/rel-eng/packages/spacewalk-repo
@@ -1 +1 @@
-1.8-3 spec-tree/spacewalk-repo/
+1.8-4 spec-tree/spacewalk-repo/
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec
b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 9b50235..343d0fc 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -1,7 +1,7 @@
Summary: Spacewalk packages yum repository configuration
Name: spacewalk-repo
Version: 1.8
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2
Group: System Environment/Base
# This src.rpm is cannonical upstream
@@ -96,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/yum.repos.d/spacewalk-client-nightly.repo
%changelog
+* Wed Oct 31 2012 Jan Pazdziora 1.8-4
+- We put the source directory under the respective version subdirectory.
+- %%defattr is not needed since rpm 4.4
+
* Mon Apr 23 2012 Jan Pazdziora 1.8-3
- Use the
yum.spacewalkproject.org address for yum repos.
commit fc42a9715a863377906f5d127d135f82875773a2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Oct 31 10:14:17 2012 +0100
We put the source directory under the respective version subdirectory.
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec
b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 82a2e62..9b50235 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -58,7 +58,7 @@ REPO
cat >>$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/spacewalk-source.repo <<REPO
[spacewalk-source]
name=Spacewalk SRPMS
-baseurl=http://spacewalk.redhat.com/source/%{version}/%{reposubdir}/
+baseurl=http://yum.spacewalkproject.org/%{version}/%{reposubdir}/source/
gpgkey=http://yum.spacewalkproject.org/RPM-GPG-KEY-spacewalk-2012
enabled=0
gpgcheck=1