Changes to 'refs/tags/cobbler-loaders-1.0.2-1'
by StephenHerr
Tag 'cobbler-loaders-1.0.2-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-04-30 19:03 +0000
Tagging package [cobbler-loaders] version [1.0.2-1] in directory [spec-tree/cobbler-loaders/].
Changes since spacewalk-utils-1.10.6-1:
Milan Zazrivec (1):
disable, enable & rebuild indexes for migrations
Stephen Herr (2):
506485 - Pull cobbler-loader files from Red Hat signed rpms
Automatic commit of package [cobbler-loaders] minor release [1.0.2-1].
Tomas Kasparek (4):
deploying /data/* content with 644 instead 755
report patterns should have 644 in git
logging pkg and errata search as INFO instead of WARN
removing duplicate left border in tables containing checkbox as 1st column
---
branding/css/spacewalk-specific.css | 6 --
java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java | 2
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java | 2
rel-eng/packages/cobbler-loaders | 2
reporting/spacewalk-reports.spec | 2
spec-tree/cobbler-loaders/cobbler-loaders.spec | 10 ++-
utils/spacewalk-dump-schema | 30 ++++++++++
7 files changed, 43 insertions(+), 11 deletions(-)
---
11 years, 1 month
2 commits - rel-eng/packages spec-tree/cobbler-loaders
by StephenHerr
rel-eng/packages/cobbler-loaders | 2 +-
spec-tree/cobbler-loaders/cobbler-loaders.spec | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit aa7564bfb52fdd27feec5b35ac4921def908e281
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Apr 30 15:03:07 2013 -0400
Automatic commit of package [cobbler-loaders] minor release [1.0.2-1].
diff --git a/rel-eng/packages/cobbler-loaders b/rel-eng/packages/cobbler-loaders
index 81b9a59..b4ccccb 100644
--- a/rel-eng/packages/cobbler-loaders
+++ b/rel-eng/packages/cobbler-loaders
@@ -1 +1 @@
-1.0.1-3 spec-tree/cobbler-loaders/
+1.0.2-1 spec-tree/cobbler-loaders/
diff --git a/spec-tree/cobbler-loaders/cobbler-loaders.spec b/spec-tree/cobbler-loaders/cobbler-loaders.spec
index 2e0c59b..0a8e7b3 100644
--- a/spec-tree/cobbler-loaders/cobbler-loaders.spec
+++ b/spec-tree/cobbler-loaders/cobbler-loaders.spec
@@ -5,7 +5,7 @@ Name: cobbler-loaders
License: GPLv2+
AutoReq: no
Version: 1.0.2
-Release: 0%{?dist}
+Release: 1%{?dist}
Url: http://fedorahosted.org/cobbler
Source0: cobbler-loaders-%{version}.tar.gz
Group: Applications/System
@@ -49,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT
%{loaders_root}/*
%changelog
+* Tue Apr 30 2013 Stephen Herr <sherr(a)redhat.com> 1.0.2-1
+- 506485 - Pull cobbler-loader files from Red Hat signed rpms
+- replace legacy name of Tagger with new one
+
* Fri Apr 12 2013 Stephen Herr <sherr(a)redhat.com> 1.0.1-2
- 506485 - settings to make builds happen correctly
commit 0f39a6a45fcecc0008421079b7df7ca794fa4529
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Apr 30 15:02:56 2013 -0400
506485 - Pull cobbler-loader files from Red Hat signed rpms
diff --git a/spec-tree/cobbler-loaders/cobbler-loaders.spec b/spec-tree/cobbler-loaders/cobbler-loaders.spec
index bb9b8bc..2e0c59b 100644
--- a/spec-tree/cobbler-loaders/cobbler-loaders.spec
+++ b/spec-tree/cobbler-loaders/cobbler-loaders.spec
@@ -4,8 +4,8 @@ Summary: Bootloaders to make cobbler buildiso work
Name: cobbler-loaders
License: GPLv2+
AutoReq: no
-Version: 1.0.1
-Release: 3%{?dist}
+Version: 1.0.2
+Release: 0%{?dist}
Url: http://fedorahosted.org/cobbler
Source0: cobbler-loaders-%{version}.tar.gz
Group: Applications/System
@@ -33,6 +33,8 @@ is necessary for 'cobbler buildiso' to work.
echo "pre-install"
mkdir -p $RPM_BUILD_ROOT%{loaders_root}
install -m644 * $RPM_BUILD_ROOT%{loaders_root}/
+ln -s /usr/share/syslinux/menu.c32 $RPM_BUILD_ROOT%{loaders_root}/menu.c32
+ln -s /usr/share/syslinux/pxelinux.0 $RPM_BUILD_ROOT%{loaders_root}/pxelinux.0
echo "post-install"
%post
11 years, 1 month
utils/spacewalk-dump-schema
by Milan Zazrivec
utils/spacewalk-dump-schema | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
New commits:
commit 615f7ac0afe3718a39716961ed5cf4bf0f6371d2
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Apr 30 16:30:19 2013 +0200
disable, enable & rebuild indexes for migrations
diff --git a/utils/spacewalk-dump-schema b/utils/spacewalk-dump-schema
index b307bbd..6dde058 100755
--- a/utils/spacewalk-dump-schema
+++ b/utils/spacewalk-dump-schema
@@ -60,6 +60,19 @@ process_scripts($dbh, 'pre');
print <<'EOS';
\set ON_ERROR_STOP on
+update pg_index
+ set indisvalid = false,
+ indisready = false
+where indexrelid in (
+ select pi.indexrelid
+ from pg_index pi,
+ pg_class pc,
+ pg_namespace pn
+ where pi.indexrelid = pc.oid and
+ pc.relnamespace = pn.oid and
+ pc.relkind = 'i'::"char" and
+ pn.nspname = current_schema()
+ );
EOS
my %ROWIDS = ();
@@ -81,6 +94,23 @@ if (not $raw) {
}
}
+print <<'EOS';
+update pg_index
+ set indisvalid = true,
+ indisready = true
+where indexrelid in (
+ select pi.indexrelid
+ from pg_index pi,
+ pg_class pc,
+ pg_namespace pn
+ where pi.indexrelid = pc.oid and
+ pc.relnamespace = pn.oid and
+ pc.relkind = 'i'::"char" and
+ pn.nspname = current_schema()
+ );
+select pg_dblink_exec('reindex database ' || current_database() || ';');
+EOS
+
exit 0;
END {
11 years, 1 month
branding/css
by Tomáš Kašpárek
branding/css/spacewalk-specific.css | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 3d45fb0591c95d0cde6cea6888d79a94dd78b723
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Apr 30 13:13:19 2013 +0200
removing duplicate left border in tables containing checkbox as 1st column
diff --git a/branding/css/spacewalk-specific.css b/branding/css/spacewalk-specific.css
index 7b68ee6..e3be5d6 100644
--- a/branding/css/spacewalk-specific.css
+++ b/branding/css/spacewalk-specific.css
@@ -41,10 +41,6 @@ table.list-doubleheader tr + tr th:first-child {
background-color: #d7d7d7;
}
-.list-checkbox {
- border-left: 1px solid #c0c0c0;
-}
-
.list-row-even td {
background-color: #eae8e4;
}
@@ -112,4 +108,4 @@ div#mainNavWrap ul li#mainLast-active {
#bar {
background-color: #383838;
-}
\ No newline at end of file
+}
11 years, 1 month
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java | 2 +-
java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 582b5339fc2577b772f6b207724043ee9579716f
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Apr 30 12:51:09 2013 +0200
logging pkg and errata search as INFO instead of WARN
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java
index 95278d9..2015f79 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/PackageSearchHelper.java
@@ -70,7 +70,7 @@ public class PackageSearchHelper {
Boolean fineGrained)
throws XmlRpcFault, MalformedURLException, SearchServerIndexException {
- log.warn("Performing pkg search: " + searchString + ", " + mode);
+ log.info("Performing pkg search: " + searchString + ", " + mode);
List<String> pkgArchLabels = null;
if (selectedArches != null) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
index bb8fbaa..e70d454 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/ErrataSearchAction.java
@@ -267,7 +267,7 @@ public class ErrataSearchAction extends RhnAction {
String searchString, String mode, DynaActionForm formIn)
throws XmlRpcFault, MalformedURLException {
- log.warn("Performing errata search");
+ log.info("Performing errata search");
RequestContext ctx = new RequestContext(request);
Org org = ctx.getCurrentUser().getOrg();
// call search server
11 years, 1 month
reporting/reports
by Tomáš Kašpárek
0 files changed
New commits:
commit 659a12e368d0997aef6df0dd4136c3b406eb9927
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Apr 30 12:40:58 2013 +0200
report patterns should have 644 in git
diff --git a/reporting/reports/data/channel-packages b/reporting/reports/data/channel-packages
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/channels b/reporting/reports/data/channels
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/entitlements b/reporting/reports/data/entitlements
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/errata-channels b/reporting/reports/data/errata-channels
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/errata-list b/reporting/reports/data/errata-list
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/errata-list-all b/reporting/reports/data/errata-list-all
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/errata-systems b/reporting/reports/data/errata-systems
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/inventory b/reporting/reports/data/inventory
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/kickstartable-trees b/reporting/reports/data/kickstartable-trees
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/scap-scan-results b/reporting/reports/data/scap-scan-results
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/system-history b/reporting/reports/data/system-history
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/system-history-channels b/reporting/reports/data/system-history-channels
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/system-history-configuration b/reporting/reports/data/system-history-configuration
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/system-history-entitlements b/reporting/reports/data/system-history-entitlements
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/system-history-errata b/reporting/reports/data/system-history-errata
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/system-history-kickstart b/reporting/reports/data/system-history-kickstart
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/system-history-packages b/reporting/reports/data/system-history-packages
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/users b/reporting/reports/data/users
old mode 100755
new mode 100644
diff --git a/reporting/reports/data/users-systems b/reporting/reports/data/users-systems
old mode 100755
new mode 100644
11 years, 1 month
reporting/spacewalk-reports.spec
by Tomáš Kašpárek
reporting/spacewalk-reports.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b415bfa283cb047ff296146b44f30115f116c127
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Apr 30 11:45:40 2013 +0200
deploying /data/* content with 644 instead 755
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index 54fbddc..78b059f 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -29,7 +29,7 @@ install -d $RPM_BUILD_ROOT/%{_prefix}/share/spacewalk/reports/data
install -d $RPM_BUILD_ROOT/%{_mandir}/man8
install spacewalk-report $RPM_BUILD_ROOT/%{_bindir}
install reports.py $RPM_BUILD_ROOT/%{_prefix}/share/spacewalk
-install reports/data/* $RPM_BUILD_ROOT/%{_prefix}/share/spacewalk/reports/data
+install -m 644 reports/data/* $RPM_BUILD_ROOT/%{_prefix}/share/spacewalk/reports/data
install *.8 $RPM_BUILD_ROOT/%{_mandir}/man8
%clean
11 years, 1 month
Changes to 'refs/tags/spacewalk-utils-1.10.6-1'
by Michael Mraka
Tag 'spacewalk-utils-1.10.6-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-04-30 08:03 +0000
Tagging package [spacewalk-utils] version [1.10.6-1] in directory [utils/].
Changes since spacewalk-backend-1.10.24-1:
Avi Miller (1):
Added Oracle Linux 5 and 6 public channels to spacewalk-common-config.ini
Michael Mraka (6):
Spacewalk 1.7 is EOL'ed
reuse _x86_archs macro
Fedora 16 is EOL'ed
removed duplicated entries
EL4 is EOL'ed for a long time
Automatic commit of package [spacewalk-utils] release [1.10.6-1].
---
rel-eng/packages/spacewalk-utils | 2
utils/spacewalk-common-channels.ini | 413 ++++++++++++++++++------------------
utils/spacewalk-utils.spec | 8
3 files changed, 221 insertions(+), 202 deletions(-)
---
11 years, 1 month
7 commits - rel-eng/packages utils/spacewalk-common-channels.ini utils/spacewalk-utils.spec
by Michael Mraka
rel-eng/packages/spacewalk-utils | 2
utils/spacewalk-common-channels.ini | 413 ++++++++++++++++++------------------
utils/spacewalk-utils.spec | 8
3 files changed, 221 insertions(+), 202 deletions(-)
New commits:
commit f4b95b115e30123484ac2496b41948dd6c53d243
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Apr 30 10:03:44 2013 +0200
Automatic commit of package [spacewalk-utils] release [1.10.6-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 686e00f..1421414 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.10.5-1 utils/
+1.10.6-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index 241e29f..cbdf2eb 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.10.5
+Version: 1.10.6
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -88,6 +88,12 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Tue Apr 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.6-1
+- EL4 is EOL'ed for a long time
+- Fedora 16 is EOL'ed
+- Spacewalk 1.7 is EOL'ed
+- Added Oracle Linux 5 and 6 public channels
+
* Fri Apr 26 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.5-1
- 956684 - don't print traceback on invalid date
commit 3a86b450ea71d82c4966a11a7bdddae724ab3b34
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Apr 30 10:00:51 2013 +0200
EL4 is EOL'ed for a long time
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 8658791..c7af03a 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -234,74 +234,6 @@ gpgkey_id = 217521F6
gpgkey_fingerprint = B940 BE07 7D71 0A28 7D7F 2DD1 119C C036 2175 21F6
yumrepo_url = http://mirrors.fedoraproject.org/mirrorlist?repo=epel-5&arch=%(arch)s
-[centos4]
-archs = %(_centos4_archs)s
-name = CentOS 4 (%(arch)s)
-gpgkey_url = http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-4
-gpgkey_id = 443E1821
-gpgkey_fingerprint = 31EA 27E5 6F79 0C18 AD79 18DF A53D 0BAB 443E 1821
-yumrepo_url = http://mirrorlist.centos.org/?release=4&arch=%(arch)s&repo=os
-dist_map_release = 4
-
-[centos4-addons]
-label = %(base_channel)s-addons
-archs = %(_centos4_archs)s
-name = CentOS 4 Addons (%(arch)s)
-base_channels = centos4-%(arch)s
-yumrepo_url = http://mirrorlist.centos.org/?release=4&arch=%(arch)s&repo=addons
-
-[centos4-centosplus]
-label = %(base_channel)s-centosplus
-archs = %(_centos4_archs)s
-name = CentOS 4 Plus (%(arch)s)
-base_channels = centos4-%(arch)s
-yumrepo_url = http://mirrorlist.centos.org/?release=4&arch=%(arch)s&repo=centosplus
-
-[centos4-contrib]
-label = %(base_channel)s-contrib
-archs = %(_centos4_archs)s
-name = CentOS 4 Contrib (%(arch)s)
-base_channels = centos4-%(arch)s
-yumrepo_url = http://mirrorlist.centos.org/?release=4&arch=%(arch)s&repo=contrib
-
-[centos4-csgfs]
-label = %(base_channel)s-csgfs
-archs = %(_centos4_archs)s
-name = CentOS 4 CS/GFS (%(arch)s)
-base_channels = centos4-%(arch)s
-yumrepo_url = http://mirror.centos.org/centos/4/csgfs/%(arch)s/
-
-[centos4-extras]
-label = %(base_channel)s-extras
-archs = %(_centos4_archs)s
-name = CentOS 4 Extras (%(arch)s)
-base_channels = centos4-%(arch)s
-yumrepo_url = http://mirrorlist.centos.org/?release=4&arch=%(arch)s&repo=extras
-
-[centos4-fasttrack]
-label = %(base_channel)s-fasttrack
-archs = %(_centos4_archs)s
-name = CentOS 4 FastTrack (%(arch)s)
-base_channels = centos4-%(arch)s
-yumrepo_url = http://mirrorlist.centos.org/?release=4&arch=%(arch)s&repo=fasttrack
-
-[centos4-updates]
-label = %(base_channel)s-updates
-archs = %(_centos4_archs)s
-name = CentOS 4 Updates (%(arch)s)
-base_channels = centos4-%(arch)s
-yumrepo_url = http://mirrorlist.centos.org/?release=4&arch=%(arch)s&repo=updates
-
-[epel4]
-label = epel4-%(base_channel)s
-name = EPEL 4 for %(base_channel_name)s
-archs = %(_x86_archs)s, ppc
-base_channels = centos4-%(arch)s
-gpgkey_url = http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL
-gpgkey_id = 217521F6
-gpgkey_fingerprint = B940 BE07 7D71 0A28 7D7F 2DD1 119C C036 2175 21F6
-yumrepo_url = http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=%(arch)s
-
[spacewalk18-server-centos5]
name = Spacewalk Server 1.8 for %(base_channel_name)s
commit 3931d436d62dfc2bf02765825b023b5c61432fa6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Apr 30 09:57:26 2013 +0200
removed duplicated entries
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index c702d04..8658791 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -35,7 +35,6 @@ _spacewalk_gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C
[fedora17]
-checksum = sha256
archs = %(_x86_archs)s
checksum = sha256
name = Fedora 17 (%(arch)s)
@@ -62,7 +61,6 @@ base_channels = fedora17-%(arch)s
yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-17&arch=%(ar...
[fedora18]
-checksum = sha256
archs = %(_x86_archs)s
checksum = sha256
name = Fedora 18 (%(arch)s)
commit aafb5693971c8e2b38203485094681a5bbaf3a1b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Apr 30 09:54:01 2013 +0200
Fedora 16 is EOL'ed
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 280e62e..c702d04 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -33,32 +33,6 @@ _spacewalk_gpgkey_url = http://yum.spacewalkproject.org/RPM-GPG-KEY-spacewalk-20
_spacewalk_gpgkey_id = 430A1C35
_spacewalk_gpgkey_fingerprint = B6F4 CBE4 8B8F 45E1 85F8 34B2 9542 3D4E 430A 1C35
-[fedora16]
-checksum = sha256
-archs = %(_x86_archs)s
-checksum = sha256
-name = Fedora 16 (%(arch)s)
-gpgkey_url = http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i38...
-gpgkey_id = 069C8460
-gpgkey_fingerprint = 25DB B54B DED7 0987 F4C1 0042 B4EB F579 069C 8460
-yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-16&arch=%(arch)s
-dist_map_release = 16
-
-[fedora16-updates]
-label = %(base_channel)s-updates
-name = Fedora 16 Updates (%(arch)s)
-archs = %(_x86_archs)s
-checksum = sha256
-base_channels = fedora16-%(arch)s
-yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=updates-released-f16&arch...
-
-[fedora16-debug]
-label = %(base_channel)s-debug
-name = Fedora 16 Debug (%(arch)s)
-archs = %(_x86_archs)s
-checksum = sha256
-base_channels = fedora16-%(arch)s
-yumrepo_url = https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-16&arch=%(ar...
[fedora17]
checksum = sha256
commit c0335c5725d4c57d2dbe9e36b84a61912a094876
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Apr 30 09:50:48 2013 +0200
reuse _x86_archs macro
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index d5c526a..280e62e 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -192,7 +192,7 @@ yumrepo_url = http://mirrorlist.centos.org/?release=6&arch=%(arch)s&repo=updates
[epel6]
label = epel6-%(base_channel)s
name = EPEL 6 for %(base_channel_name)s
-archs = i386, x86_64, ppc64
+archs = %(_x86_archs)s, ppc64
base_channels = centos6-%(arch)s scientific6-%(arch)s
gpgkey_url = http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6
gpgkey_id = 0608B895
@@ -255,7 +255,7 @@ yumrepo_url = http://mirrorlist.centos.org/?release=5&arch=%(arch)s&repo=updates
[epel5]
label = epel5-%(base_channel)s
name = EPEL 5 for %(base_channel_name)s
-archs = i386, x86_64, ppc
+archs = %(_x86_archs)s, ppc
base_channels = centos5-%(arch)s
gpgkey_url = http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL
gpgkey_id = 217521F6
@@ -323,7 +323,7 @@ yumrepo_url = http://mirrorlist.centos.org/?release=4&arch=%(arch)s&repo=updates
[epel4]
label = epel4-%(base_channel)s
name = EPEL 4 for %(base_channel_name)s
-archs = i386, x86_64, ppc
+archs = %(_x86_archs)s, ppc
base_channels = centos4-%(arch)s
gpgkey_url = http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL
gpgkey_id = 217521F6
@@ -333,7 +333,7 @@ yumrepo_url = http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=%(arc
[spacewalk18-server-centos5]
name = Spacewalk Server 1.8 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = centos5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -342,7 +342,7 @@ 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
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = centos6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -351,7 +351,7 @@ 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
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = scientific6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -360,7 +360,7 @@ 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
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = fedora16-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -369,7 +369,7 @@ 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
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = fedora17-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -378,7 +378,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.8/Fedora/17/%(arch)s/
[spacewalk18-server-oraclelinux5]
name = Spacewalk Server 1.8 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = oraclelinux5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -387,7 +387,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.8/RHEL/5/%(arch)s/
[spacewalk18-server-oraclelinux6]
name = Spacewalk Server 1.8 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = oraclelinux6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -396,7 +396,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.8/RHEL/6/%(arch)s/
[spacewalk18-client-centos5]
name = Spacewalk Client 1.8 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = centos5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -405,7 +405,7 @@ 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
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = centos6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -414,7 +414,7 @@ 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
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = scientific6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -423,7 +423,7 @@ 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
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = fedora16-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -432,7 +432,7 @@ 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
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = fedora17-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -441,7 +441,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.8-client/Fedora/17/%(arch)s/
[spacewalk18-client-oraclelinux5]
name = Spacewalk Client 1.8 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = oraclelinux5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -450,7 +450,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.8-client/RHEL/5/%(arch)s/
[spacewalk18-client-oraclelinux6]
name = Spacewalk Client 1.8 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = oraclelinux6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -460,7 +460,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.8-client/RHEL/6/%(arch)s/
[spacewalk19-server-centos5]
name = Spacewalk Server 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = centos5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -469,7 +469,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9/RHEL/5/%(arch)s/
[spacewalk19-server-centos6]
name = Spacewalk Server 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = centos6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -478,7 +478,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9/RHEL/6/%(arch)s/
[spacewalk19-server-scientific6]
name = Spacewalk Server 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = scientific6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -487,7 +487,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9/RHEL/6/%(arch)s/
[spacewalk19-server-fedora17]
name = Spacewalk Server 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = fedora17-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -496,7 +496,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9/Fedora/17/%(arch)s/
[spacewalk19-server-fedora18]
name = Spacewalk Server 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = fedora18-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -505,7 +505,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9/Fedora/18/%(arch)s/
[spacewalk19-server-oraclelinux5]
name = Spacewalk Server 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = oraclelinux5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -514,7 +514,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9/RHEL/5/%(arch)s/
[spacewalk19-server-oraclelinux6]
name = Spacewalk Server 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = oraclelinux6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -523,7 +523,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9/RHEL/6/%(arch)s/
[spacewalk19-client-centos5]
name = Spacewalk Client 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = centos5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -532,7 +532,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9-client/RHEL/5/%(arch)s/
[spacewalk19-client-centos6]
name = Spacewalk Client 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = centos6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -541,7 +541,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9-client/RHEL/6/%(arch)s/
[spacewalk19-client-scientific6]
name = Spacewalk Client 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = scientific6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -550,7 +550,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9-client/RHEL/6/%(arch)s/
[spacewalk19-client-fedora17]
name = Spacewalk Client 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = fedora17-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -559,7 +559,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9-client/Fedora/17/%(arch)s/
[spacewalk19-client-fedora18]
name = Spacewalk Client 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = fedora18-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -568,7 +568,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9-client/Fedora/18/%(arch)s/
[spacewalk19-client-oraclelinux5]
name = Spacewalk Client 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = oraclelinux5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -577,7 +577,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9-client/RHEL/5/%(arch)s/
[spacewalk19-client-oraclelinux6]
name = Spacewalk Client 1.9 for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = oraclelinux6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -587,7 +587,7 @@ yumrepo_url = http://yum.spacewalkproject.org/1.9-client/RHEL/6/%(arch)s/
[spacewalk-nightly-server-centos5]
name = Spacewalk Server (N) for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = centos5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -596,7 +596,7 @@ yumrepo_url = http://yum.spacewalkproject.org/nightly/RHEL/5/%(arch)s/
[spacewalk-nightly-server-centos6]
name = Spacewalk Server (N) for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = centos6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -605,7 +605,7 @@ yumrepo_url = http://yum.spacewalkproject.org/nightly/RHEL/6/%(arch)s/
[spacewalk-nightly-server-scientific6]
name = Spacewalk Server (N) for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = scientific6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -641,7 +641,7 @@ yumrepo_url = http://yum.spacewalkproject.org/nightly/Fedora/18/%(arch)s/
[spacewalk-nightly-server-oraclelinux5]
name = Spacewalk Server (N) for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = oraclelinux5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -650,7 +650,7 @@ yumrepo_url = http://yum.spacewalkproject.org/nightly/RHEL/5/%(arch)s/
[spacewalk-nightly-server-oraclelinux6]
name = Spacewalk Server (N) for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = oraclelinux6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -659,7 +659,7 @@ yumrepo_url = http://yum.spacewalkproject.org/nightly/RHEL/6/%(arch)s/
[spacewalk-nightly-client-centos5]
name = Spacewalk Client (N) for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = centos5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -668,7 +668,7 @@ 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
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = centos6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -677,7 +677,7 @@ 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
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = scientific6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -686,7 +686,7 @@ 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
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = fedora16-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -695,7 +695,7 @@ 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
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = fedora17-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -704,7 +704,7 @@ yumrepo_url = http://yum.spacewalkproject.org/nightly-client/Fedora/17/%(arch)s/
[spacewalk-nightly-client-fedora18]
name = Spacewalk Client (N) for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = fedora18-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -713,7 +713,7 @@ yumrepo_url = http://yum.spacewalkproject.org/nightly-client/Fedora/18/%(arch)s/
[spacewalk-nightly-client-oraclelinux5]
name = Spacewalk Client (N) for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = oraclelinux5-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
@@ -722,7 +722,7 @@ yumrepo_url = http://yum.spacewalkproject.org/nightly-client/RHEL/5/%(arch)s/
[spacewalk-nightly-client-oraclelinux6]
name = Spacewalk Client (N) for %(base_channel_name)s
-archs = i386, x86_64
+archs = %(_x86_archs)s
base_channels = oraclelinux6-%(arch)s
gpgkey_url = %(_spacewalk_gpgkey_url)s
gpgkey_id = %(_spacewalk_gpgkey_id)s
commit 71a3617de5a72f16ec001634c679b3939279ed17
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Apr 30 09:47:42 2013 +0200
Spacewalk 1.7 is EOL'ed
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 84b5ac1..d5c526a 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -331,115 +331,6 @@ gpgkey_fingerprint = B940 BE07 7D71 0A28 7D7F 2DD1 119C C036 2175 21F6
yumrepo_url = http://mirrors.fedoraproject.org/mirrorlist?repo=epel-4&arch=%(arch)s
-[spacewalk17-server-centos5]
-name = Spacewalk Server 1.7 for %(base_channel_name)s
-archs = i386, x86_64
-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://yum.spacewalkproject.org/1.7/RHEL/5/%(arch)s/
-
-[spacewalk17-server-centos6]
-name = Spacewalk Server 1.7 for %(base_channel_name)s
-archs = i386, x86_64
-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://yum.spacewalkproject.org/1.7/RHEL/6/%(arch)s/
-
-[spacewalk17-server-scientific6]
-name = Spacewalk Server 1.7 for %(base_channel_name)s
-archs = i386, x86_64
-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://yum.spacewalkproject.org/1.7/RHEL/6/%(arch)s/
-
-[spacewalk17-server-fedora16]
-name = Spacewalk Server 1.7 for %(base_channel_name)s
-archs = i386, x86_64
-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://yum.spacewalkproject.org/1.7/Fedora/16/%(arch)s/
-
-[spacewalk17-server-oraclelinux5]
-name = Spacewalk Server 1.7 for %(base_channel_name)s
-archs = i386, x86_64
-base_channels = oraclelinux5-%(arch)s
-gpgkey_url = %(_spacewalk_gpgkey_url)s
-gpgkey_id = %(_spacewalk_gpgkey_id)s
-gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url = http://yum.spacewalkproject.org/1.7/RHEL/5/%(arch)s/
-
-[spacewalk17-server-oraclelinux6]
-name = Spacewalk Server 1.7 for %(base_channel_name)s
-archs = i386, x86_64
-base_channels = oraclelinux6-%(arch)s
-gpgkey_url = %(_spacewalk_gpgkey_url)s
-gpgkey_id = %(_spacewalk_gpgkey_id)s
-gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url = http://yum.spacewalkproject.org/1.7/RHEL/6/%(arch)s/
-
-[spacewalk17-client-centos5]
-name = Spacewalk Client 1.7 for %(base_channel_name)s
-archs = i386, x86_64
-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://yum.spacewalkproject.org/1.7-client/RHEL/5/%(arch)s/
-
-[spacewalk17-client-centos6]
-name = Spacewalk Client 1.7 for %(base_channel_name)s
-archs = i386, x86_64
-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://yum.spacewalkproject.org/1.7-client/RHEL/6/%(arch)s/
-
-[spacewalk17-client-scientific6]
-name = Spacewalk Client 1.7 for %(base_channel_name)s
-archs = i386, x86_64
-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://yum.spacewalkproject.org/1.7-client/RHEL/6/%(arch)s/
-
-[spacewalk17-client-fedora16]
-name = Spacewalk Client 1.7 for %(base_channel_name)s
-archs = i386, x86_64
-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://yum.spacewalkproject.org/1.7-client/Fedora/16/%(arch)s/
-
-[spacewalk17-client-oraclelinux5]
-name = Spacewalk Client 1.7 for %(base_channel_name)s
-archs = i386, x86_64
-base_channels = oraclelinux5-%(arch)s
-gpgkey_url = %(_spacewalk_gpgkey_url)s
-gpgkey_id = %(_spacewalk_gpgkey_id)s
-gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url = http://yum.spacewalkproject.org/1.7-client/RHEL/5/%(arch)s/
-
-[spacewalk17-client-oraclelinux6]
-name = Spacewalk Client 1.7 for %(base_channel_name)s
-archs = i386, x86_64
-base_channels = oraclelinux6-%(arch)s
-gpgkey_url = %(_spacewalk_gpgkey_url)s
-gpgkey_id = %(_spacewalk_gpgkey_id)s
-gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
-yumrepo_url = http://yum.spacewalkproject.org/1.7-client/RHEL/6/%(arch)s/
-
-
[spacewalk18-server-centos5]
name = Spacewalk Server 1.8 for %(base_channel_name)s
archs = i386, x86_64
@@ -1001,4 +892,4 @@ label = %(base_channel)s-uek
archs = %(_x86_archs)s
name = Oracle Linux 5 UEK (%(arch)s)
base_channels = oraclelinux5-%(arch)s
-yumrepo_url = http://public-yum.oracle.com/repo/OracleLinux/OL5/UEK/latest/%(arch)s/
\ No newline at end of file
+yumrepo_url = http://public-yum.oracle.com/repo/OracleLinux/OL5/UEK/latest/%(arch)s/
commit 550e7dd9a91a4c83a43c667ee4638b4bf3b1114e
Author: Avi Miller <avi.miller(a)oracle.com>
Date: Tue Apr 30 10:33:39 2013 +1000
Added Oracle Linux 5 and 6 public channels to spacewalk-common-config.ini
This patch adds stanzas for the publicly available Oracle Linux 5 and 6 channels on public-yum.oracle.com. It also adds spacewalk client and server stanzas for Oracle Linux 5 and 6.
Signed-off-by: Avi Miller <avi.miller(a)oracle.com>
diff --git a/utils/spacewalk-common-channels.ini b/utils/spacewalk-common-channels.ini
index 5a38984..84b5ac1 100644
--- a/utils/spacewalk-common-channels.ini
+++ b/utils/spacewalk-common-channels.ini
@@ -367,6 +367,24 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/1.7/Fedora/16/%(arch)s/
+[spacewalk17-server-oraclelinux5]
+name = Spacewalk Server 1.7 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux5-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/1.7/RHEL/5/%(arch)s/
+
+[spacewalk17-server-oraclelinux6]
+name = Spacewalk Server 1.7 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/1.7/RHEL/6/%(arch)s/
+
[spacewalk17-client-centos5]
name = Spacewalk Client 1.7 for %(base_channel_name)s
archs = i386, x86_64
@@ -403,6 +421,24 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/1.7-client/Fedora/16/%(arch)s/
+[spacewalk17-client-oraclelinux5]
+name = Spacewalk Client 1.7 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux5-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/1.7-client/RHEL/5/%(arch)s/
+
+[spacewalk17-client-oraclelinux6]
+name = Spacewalk Client 1.7 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/1.7-client/RHEL/6/%(arch)s/
+
[spacewalk18-server-centos5]
name = Spacewalk Server 1.8 for %(base_channel_name)s
@@ -449,6 +485,24 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/1.8/Fedora/17/%(arch)s/
+[spacewalk18-server-oraclelinux5]
+name = Spacewalk Server 1.8 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux5-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/1.8/RHEL/5/%(arch)s/
+
+[spacewalk18-server-oraclelinux6]
+name = Spacewalk Server 1.8 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/1.8/RHEL/6/%(arch)s/
+
[spacewalk18-client-centos5]
name = Spacewalk Client 1.8 for %(base_channel_name)s
archs = i386, x86_64
@@ -494,6 +548,24 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/1.8-client/Fedora/17/%(arch)s/
+[spacewalk18-client-oraclelinux5]
+name = Spacewalk Client 1.8 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux5-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/1.8-client/RHEL/5/%(arch)s/
+
+[spacewalk18-client-oraclelinux6]
+name = Spacewalk Client 1.8 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/1.8-client/RHEL/6/%(arch)s/
+
[spacewalk19-server-centos5]
name = Spacewalk Server 1.9 for %(base_channel_name)s
@@ -540,6 +612,24 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/1.9/Fedora/18/%(arch)s/
+[spacewalk19-server-oraclelinux5]
+name = Spacewalk Server 1.9 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux5-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/1.9/RHEL/5/%(arch)s/
+
+[spacewalk19-server-oraclelinux6]
+name = Spacewalk Server 1.9 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/1.9/RHEL/6/%(arch)s/
+
[spacewalk19-client-centos5]
name = Spacewalk Client 1.9 for %(base_channel_name)s
archs = i386, x86_64
@@ -585,6 +675,23 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/1.9-client/Fedora/18/%(arch)s/
+[spacewalk19-client-oraclelinux5]
+name = Spacewalk Client 1.9 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux5-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/1.9-client/RHEL/5/%(arch)s/
+
+[spacewalk19-client-oraclelinux6]
+name = Spacewalk Client 1.9 for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/1.9-client/RHEL/6/%(arch)s/
[spacewalk-nightly-server-centos5]
@@ -641,6 +748,23 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/nightly/Fedora/18/%(arch)s/
+[spacewalk-nightly-server-oraclelinux5]
+name = Spacewalk Server (N) for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux5-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/nightly/RHEL/5/%(arch)s/
+
+[spacewalk-nightly-server-oraclelinux6]
+name = Spacewalk Server (N) for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/nightly/RHEL/6/%(arch)s/
[spacewalk-nightly-client-centos5]
name = Spacewalk Client (N) for %(base_channel_name)s
@@ -696,6 +820,24 @@ gpgkey_id = %(_spacewalk_gpgkey_id)s
gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
yumrepo_url = http://yum.spacewalkproject.org/nightly-client/Fedora/18/%(arch)s/
+[spacewalk-nightly-client-oraclelinux5]
+name = Spacewalk Client (N) for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux5-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/nightly-client/RHEL/5/%(arch)s/
+
+[spacewalk-nightly-client-oraclelinux6]
+name = Spacewalk Client (N) for %(base_channel_name)s
+archs = i386, x86_64
+base_channels = oraclelinux6-%(arch)s
+gpgkey_url = %(_spacewalk_gpgkey_url)s
+gpgkey_id = %(_spacewalk_gpgkey_id)s
+gpgkey_fingerprint = %(_spacewalk_gpgkey_fingerprint)s
+yumrepo_url = http://yum.spacewalkproject.org/nightly-client/RHEL/6/%(arch)s/
+
[opensuse12_2]
checksum = sha1
@@ -784,3 +926,79 @@ gpgkey_url = http://download.opensuse.org/repositories/systemsmanagement:/spacew
gpgkey_id = A0E46E11
gpgkey_fingerprint = 68D3 3874 9967 0AEB D988 2DB3 2ABF A143 A0E4 6E11
yumrepo_url = http://download.opensuse.org/repositories/systemsmanagement:/spacewalk:/1...
+
+
+[oraclelinux6]
+archs = %(_x86_archs)s
+name = Oracle Linux 6 (%(arch)s)
+checksum = sha256
+gpgkey_url = http://public-yum.oracle.com/RPM-GPG-KEY-oracle-ol6
+gpgkey_id = EC551F03
+gpgkey_fingerprint = 4214 4123 FECF C55B 9086 313D 72F9 7B74 EC55 1F03
+yumrepo_url = http://public-yum.oracle.com/repo/OracleLinux/OL6/latest/%(arch)s/
+dist_map_release = 6
+
+[oraclelinux6-addons]
+label = %(base_channel)s-addons
+archs = %(_x86_archs)s
+name = Oracle Linux 6 Addons (%(arch)s)
+base_channels = oraclelinux6-%(arch)s
+yumrepo_url = http://public-yum.oracle.com/repo/OracleLinux/OL6/addons/%(arch)s/
+
+[oraclelinux6-uek]
+label = %(base_channel)s-uek
+archs = %(_x86_archs)s
+name = Oracle Linux 6 UEK (%(arch)s)
+base_channels = oraclelinux6-%(arch)s
+yumrepo_url = http://public-yum.oracle.com/repo/OracleLinux/OL6/UEK/latest/%(arch)s/
+
+[oraclelinux6-mysql]
+label = %(base_channel)s-mysql
+archs = %(_x86_archs)s
+name = Oracle Linux 6 MySQL (%(arch)s)
+base_channels = oraclelinux6-%(arch)s
+yumrepo_url = http://public-yum.oracle.com/repo/OracleLinux/OL6/MySQL/%(arch)s/
+
+[oraclelinux6-playground]
+label = %(base_channel)s-playground
+archs = x86_64
+name = Oracle Linux 6 Playground (%(arch)s)
+base_channels = oraclelinux6-%(arch)s
+yumrepo_url = http://public-yum.oracle.com/repo/OracleLinux/OL6/playground/latest/%(arc...
+
+[oraclelinux5]
+archs = %(_x86_archs)s
+name = Oracle Linux 5 (%(arch)s)
+gpgkey_url = http://public-yum.oracle.com/RPM-GPG-KEY-oracle-el5
+gpgkey_id = 1E5E0159
+gpgkey_fingerprint = 99FD 2766 28EE DECB 5E5A F5F8 66CE D3DE 1E5E 0159
+yumrepo_url = http://public-yum.oracle.com/repo/OracleLinux/OL5/latest/%(arch)s/
+dist_map_release = 5
+
+[oraclelinux5-addons]
+label = %(base_channel)s-addons
+archs = %(_x86_archs)s
+name = Oracle Linux 5 Addons (%(arch)s)
+base_channels = oraclelinux5-%(arch)s
+yumrepo_url = http://public-yum.oracle.com/repo/EnterpriseLinux/EL5/addons/%(arch)s/
+
+[oraclelinux5-oracle-addons]
+label = %(base_channel)s-oracle-addons
+archs = %(_x86_archs)s
+name = Oracle Linux 5 Oracle Addons (%(arch)s)
+base_channels = oraclelinux5-%(arch)s
+yumrepo_url = http://public-yum.oracle.com/repo/EnterpriseLinux/EL5/oracle_addons/%(arc...
+
+[oraclelinux5-unsupported]
+label = %(base_channel)s-unsupported
+archs = %(_x86_archs)s
+name = Oracle Linux 5 Unsupported (%(arch)s)
+base_channels = oraclelinux5-%(arch)s
+yumrepo_url = http://public-yum.oracle.com/repo/EnterpriseLinux/EL5/unsupported/%(arch)s/
+
+[oraclelinux5-uek]
+label = %(base_channel)s-uek
+archs = %(_x86_archs)s
+name = Oracle Linux 5 UEK (%(arch)s)
+base_channels = oraclelinux5-%(arch)s
+yumrepo_url = http://public-yum.oracle.com/repo/OracleLinux/OL5/UEK/latest/%(arch)s/
\ No newline at end of file
11 years, 1 month
Changes to 'refs/tags/spacewalk-backend-1.10.24-1'
by StephenHerr
Tag 'spacewalk-backend-1.10.24-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-04-29 17:25 +0000
Tagging package [spacewalk-backend] version [1.10.24-1] in directory [backend/].
Changes since spacewalk-schema-1.10.26-1:
Stephen Herr (3):
Revert "Additional change for spacewalk-backend daemon mode"
Revert "Run python backend in daemon mode to ease integration with splice"
Automatic commit of package [spacewalk-backend] release [1.10.24-1].
---
backend/apache-conf/zz-spacewalk-server-wsgi.conf | 13 +------------
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 14 deletions(-)
---
11 years, 1 month