Branch 'SPACEWALK-0.6' - 2 commits - rel-eng/packages spacewalk/setup
by Milan Zazrivec
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/share/upgrade/rhn-update-monitoring.pl | 2 +-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit d2f72f44530006463daf173c04981db33c43bb63
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Aug 7 11:57:16 2009 +0200
Automatic commit of package [spacewalk-setup] release [0.6.21-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index d9a9b45..79cbbb9 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-0.6.20-1 spacewalk/setup/
+0.6.21-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index a583d8a..89b446d 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 0.6.20
+Version: 0.6.21
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -101,6 +101,9 @@ rm -rf %{buildroot}
%dir %{_sysconfdir}/pki/spacewalk/jabberd
%changelog
+* Fri Aug 07 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 0.6.21-1
+- fix missing column name
+
* Thu Aug 06 2009 Milan Zazrivec <mzazrivec(a)redhat.com> 0.6.20-1
- update spacewalk / satellite monitoring scout ip address
commit e9890bcb6070292ee7b35af5678d3775853f4dba
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Aug 7 11:52:06 2009 +0200
fix missing column name
diff --git a/spacewalk/setup/share/upgrade/rhn-update-monitoring.pl b/spacewalk/setup/share/upgrade/rhn-update-monitoring.pl
index ecb538e..f90e73b 100755
--- a/spacewalk/setup/share/upgrade/rhn-update-monitoring.pl
+++ b/spacewalk/setup/share/upgrade/rhn-update-monitoring.pl
@@ -57,7 +57,7 @@ my $sql3 = q{
set ip = :ip,
last_update_user = 'upgrade',
last_update_date = sysdate
- where is null and
+ where ip is null and
recid = :recid
};
my $sql4 = q{
14 years, 9 months
Changes to 'refs/tags/spacewalk-java-0.6.42-1'
by Jesus M. Rodriguez
Tag 'spacewalk-java-0.6.42-1' created by jesus m. rodriguez <jesusr(a)redhat.com> at 2009-08-07 05:01 +0000
Tagging package [spacewalk-java] version [0.6.42-1] in directory [java/].
Changes since rhnlib-2.5.13-1:
Justin Sherrill (3):
adding newest fedora gpg key, and moving _data sql file to the right place
adding upgrade for new fedora gpg key
adding reposync task to taskomatic config
jesus m. rodriguez (1):
Automatic commit of package [spacewalk-java] release [0.6.42-1].
---
java/conf/default/rhn_taskomatic.conf | 5 +-
java/spacewalk-java.spec | 5 +-
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/common/data/rhnContentSourceType.sql | 21 ++++++++++
schema/spacewalk/common/data/rhnPackageKey.sql | 2
schema/spacewalk/common/tables/rhnContentSourceType_data.sql | 21 ----------
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/193-rhn-PackageKey.sql | 2
7 files changed, 33 insertions(+), 25 deletions(-)
---
14 years, 9 months
Branch 'SPACEWALK-0.6' - java/spacewalk-java.spec rel-eng/packages
by Jesus M. Rodriguez
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 5bed6be7ba80d83007124cd9153de1f461c90d1f
Author: jesus m. rodriguez <jesusr(a)redhat.com>
Date: Fri Aug 7 01:01:30 2009 -0400
Automatic commit of package [spacewalk-java] release [0.6.42-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ac6b470..eaab22c 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.6.41
+Version: 0.6.42
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ fi
%attr(644, root, root) %{_datadir}/rhn/lib/rhn.jar
%changelog
+* Fri Aug 07 2009 jesus m. rodriguez <jesusr(a)redhat.com> 0.6.42-1
+- adding reposync task to taskomatic config (jsherril(a)redhat.com)
+
* Wed Aug 05 2009 John Matthews <jmatthew(a)redhat.com> 0.6.41-1
- 509474 - make sure we symlink to stringtree-json (mmccune(a)redhat.com)
- 509474 - fixing NPE (joshua.roys(a)gtri.gatech.edu)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 21418a0..089b5af 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.6.41-1 java/
+0.6.42-1 java/
14 years, 9 months
java/conf
by Justin Sherrill
java/conf/default/rhn_taskomatic.conf | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit f54c1f96f54a98359a0393f19e516af67f32d876
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Aug 6 23:31:05 2009 -0400
adding reposync task to taskomatic config
diff --git a/java/conf/default/rhn_taskomatic.conf b/java/conf/default/rhn_taskomatic.conf
index a4b36f7..6fe0b3c 100644
--- a/java/conf/default/rhn_taskomatic.conf
+++ b/java/conf/default/rhn_taskomatic.conf
@@ -21,7 +21,8 @@ com.redhat.rhn.taskomatic.task.SummaryPopulation,\
com.redhat.rhn.taskomatic.task.ErrataCacheTask,\
com.redhat.rhn.taskomatic.task.CobblerSyncTask,\
com.redhat.rhn.taskomatic.task.ChannelRepodata,\
-com.redhat.rhn.taskomatic.task.KickstartFileSyncTask
+com.redhat.rhn.taskomatic.task.KickstartFileSyncTask,\
+com.redhat.rhn.taskomatic.task.RepoSyncTask
# additional tasks
taskomatic.tasks =
@@ -47,7 +48,7 @@ taskomatic.com.redhat.rhn.taskomatic.task.SynchProbeState.schedule = 0 * * * * ?
taskomatic.com.redhat.rhn.taskomatic.task.ErrataQueue.schedule = 0 * * * * ?
taskomatic.com.redhat.rhn.taskomatic.task.CobblerSyncTask.schedule = 0 * * * * ?
taskomatic.com.redhat.rhn.taskomatic.task.ChannelRepodata.schedule = 0 * * * * ?
-
+taskomatic.com.redhat.rhn.taskomatic.task.RepoSyncTask.schedule = 0 * * * * ?
# Every 10 minutes
taskomatic.com.redhat.rhn.taskomatic.task.PackageCleanup.schedule = 0 0/10 * * * ?
14 years, 9 months
Branch 'SPACEWALK-0.6' - java/conf
by Justin Sherrill
java/conf/default/rhn_taskomatic.conf | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e3409919acc4658a53a048575a77d417416b1da1
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Aug 6 23:31:05 2009 -0400
adding reposync task to taskomatic config
diff --git a/java/conf/default/rhn_taskomatic.conf b/java/conf/default/rhn_taskomatic.conf
index a4b36f7..6fe0b3c 100644
--- a/java/conf/default/rhn_taskomatic.conf
+++ b/java/conf/default/rhn_taskomatic.conf
@@ -21,7 +21,8 @@ com.redhat.rhn.taskomatic.task.SummaryPopulation,\
com.redhat.rhn.taskomatic.task.ErrataCacheTask,\
com.redhat.rhn.taskomatic.task.CobblerSyncTask,\
com.redhat.rhn.taskomatic.task.ChannelRepodata,\
-com.redhat.rhn.taskomatic.task.KickstartFileSyncTask
+com.redhat.rhn.taskomatic.task.KickstartFileSyncTask,\
+com.redhat.rhn.taskomatic.task.RepoSyncTask
# additional tasks
taskomatic.tasks =
@@ -47,7 +48,7 @@ taskomatic.com.redhat.rhn.taskomatic.task.SynchProbeState.schedule = 0 * * * * ?
taskomatic.com.redhat.rhn.taskomatic.task.ErrataQueue.schedule = 0 * * * * ?
taskomatic.com.redhat.rhn.taskomatic.task.CobblerSyncTask.schedule = 0 * * * * ?
taskomatic.com.redhat.rhn.taskomatic.task.ChannelRepodata.schedule = 0 * * * * ?
-
+taskomatic.com.redhat.rhn.taskomatic.task.RepoSyncTask.schedule = 0 * * * * ?
# Every 10 minutes
taskomatic.com.redhat.rhn.taskomatic.task.PackageCleanup.schedule = 0 0/10 * * * ?
14 years, 9 months
scripts/schema-updater
by Partha Aji
scripts/schema-updater | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
New commits:
commit 106fcc490722dd305101478753df073996bda7b2
Author: Partha Aji <paji(a)redhat.com>
Date: Thu Aug 6 19:55:34 2009 -0400
Fixed some table_space issues with schema-updater script
diff --git a/scripts/schema-updater b/scripts/schema-updater
index 3270a3a..4a8606e 100755
--- a/scripts/schema-updater
+++ b/scripts/schema-updater
@@ -4,6 +4,19 @@ import sys
import optparse
import re
import subprocess
+import cx_Oracle
+import re
+
+_query = """select default_tablespace from user_users
+ where username = sys_context('userenv', 'session_user')"""
+def get_table_space(options):
+ con = cx_Oracle.Connection(options.connect)
+ cursor = con.cursor()
+ cursor.execute(_query)
+ ret = cursor.fetchall()[0][0]
+ cursor.close()
+ con.close()
+ return ret
def execute(command, shell=False, ignore_rc=False):
if subprocess.call(command, shell = shell) != 0:
@@ -40,6 +53,9 @@ def main():
for f in files:
lines.extend([line.strip() for line in open(f).readlines() if not p.match(line)])
if lines:
+ x = re.compile(r"tablespace\s+([\[\]\w]+)")
+ table_space = get_table_space(options)
+ lines = [x.sub("tablespace " + table_space, line) for line in lines]
lines.append("commit;")
f = "/tmp/__lines.sql"
open(f,"w").write("\n".join(lines))
14 years, 9 months
backend/spacewalk-backend.spec client/rhel java/spacewalk-java.spec proxy/installer proxy/proxy proxy/proxy-docs search-server/spacewalk-doc-indexes search-server/spacewalk-search.spec spacewalk/admin spacewalk/certs-tools spacewalk/config spec-tree/spacewalk-repo web/spacewalk-web.spec
by John Matthews
backend/spacewalk-backend.spec | 2 +-
client/rhel/rhn-client-tools/rhn-client-tools.spec | 2 +-
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 2 +-
java/spacewalk-java.spec | 2 +-
proxy/installer/spacewalk-proxy-installer.spec | 2 +-
proxy/proxy-docs/spacewalk-proxy-docs.spec | 2 +-
proxy/proxy/spacewalk-proxy.spec | 2 +-
search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec | 2 +-
search-server/spacewalk-search.spec | 2 +-
spacewalk/admin/spacewalk-admin.spec | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 2 +-
spacewalk/config/spacewalk-config.spec | 2 +-
spec-tree/spacewalk-repo/spacewalk-repo.spec | 2 +-
web/spacewalk-web.spec | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit b47b6b401ed7e36c2609f475056b3b2adfabfb39
Author: John Matthews <jmatthew(a)redhat.com>
Date: Thu Aug 6 17:23:20 2009 -0400
bumping versions to 0.7.0
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 495fdde..401c273 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -7,7 +7,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.6.30
+Version: 0.7.0
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index ad972bd..adcd1eb 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 0.6.2
+Version: 0.7.0
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 686018d..b41e7f0 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,7 +1,7 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
Source: %{name}-%{version}.tar.gz
-Version: 0.6.1
+Version: 0.7.0
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ac6b470..700cb67 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.6.41
+Version: 0.7.0
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec
index bb323a9..e45d894 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer
Summary: Spacewalk Proxy Server Installer
Group: Applications/Internet
License: GPLv2
-Version: 0.6.21
+Version: 0.7.0
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
diff --git a/proxy/proxy-docs/spacewalk-proxy-docs.spec b/proxy/proxy-docs/spacewalk-proxy-docs.spec
index 0459eea..2c715df 100644
--- a/proxy/proxy-docs/spacewalk-proxy-docs.spec
+++ b/proxy/proxy-docs/spacewalk-proxy-docs.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: Open Publication
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.6.2
+Version: 0.7.0
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index a986f07..41937cb 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 0.6.8
+Version: 0.7.0
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
diff --git a/search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec b/search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec
index a9e5609..9cf4314 100644
--- a/search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec
+++ b/search-server/spacewalk-doc-indexes/spacewalk-doc-indexes.spec
@@ -1,5 +1,5 @@
Name: spacewalk-doc-indexes
-Version: 0.6.1
+Version: 0.7.0
Release: 1%{?dist}
Summary: Lucene indexes of help documentation for spacewalk
diff --git a/search-server/spacewalk-search.spec b/search-server/spacewalk-search.spec
index 66f5303..1a7f821 100644
--- a/search-server/spacewalk-search.spec
+++ b/search-server/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 0.6.11
+Version: 0.7.0
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index cb6adfd..c287019 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -2,7 +2,7 @@
Summary: Various utility scripts and data files for RHN Satellite installations
Name: spacewalk-admin
URL: https://fedorahosted.org/spacewalk
-Version: 0.6.3
+Version: 0.7.0
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
License: GPLv2
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 0bafd8a..821d8c3 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2
-Version: 0.6.3
+Version: 0.7.0
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index e7e68b3..17e19fa 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -2,7 +2,7 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 0.6.13
+Version: 0.7.0
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
diff --git a/spec-tree/spacewalk-repo/spacewalk-repo.spec b/spec-tree/spacewalk-repo/spacewalk-repo.spec
index 223347c..d108bc8 100644
--- a/spec-tree/spacewalk-repo/spacewalk-repo.spec
+++ b/spec-tree/spacewalk-repo/spacewalk-repo.spec
@@ -1,6 +1,6 @@
Summary: Spacewalk packages yum repository configuration.
Name: spacewalk-repo
-Version: 0.6
+Version: 0.7.0
Release: 1%{?dist}
License: GPL
Group: Development
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 933b416..e09e4b3 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.6.19
+Version: 0.7.0
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
14 years, 9 months
Branch 'SPACEWALK-0.6' - schema/spacewalk
by Justin Sherrill
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/193-rhn-PackageKey.sql | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 07c3476879b0a1b0ae7435509eea8b606696b00f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Aug 6 14:10:27 2009 -0400
adding upgrade for new fedora gpg key
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/193-rhn-PackageKey.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/193-rhn-PackageKey.sql
new file mode 100644
index 0000000..8f19f31
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/193-rhn-PackageKey.sql
@@ -0,0 +1,2 @@
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+ (rhn_pkey_id_seq.nextval, '1dc5c758d22e77f2', lookup_package_key_type('gpg'), lookup_package_provider('Fedora'));
14 years, 9 months
schema/spacewalk
by Justin Sherrill
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/193-rhn-PackageKey.sql | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 2124f62920321c39f82519c8e7be55cbb370ec47
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Aug 6 14:10:27 2009 -0400
adding upgrade for new fedora gpg key
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/193-rhn-PackageKey.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/193-rhn-PackageKey.sql
new file mode 100644
index 0000000..8f19f31
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/193-rhn-PackageKey.sql
@@ -0,0 +1,2 @@
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+ (rhn_pkey_id_seq.nextval, '1dc5c758d22e77f2', lookup_package_key_type('gpg'), lookup_package_provider('Fedora'));
14 years, 9 months
Branch 'SPACEWALK-0.6' - schema/spacewalk
by Justin Sherrill
schema/spacewalk/common/data/rhnContentSourceType.sql | 21 +++++++++++
schema/spacewalk/common/data/rhnPackageKey.sql | 2 +
schema/spacewalk/common/tables/rhnContentSourceType_data.sql | 21 -----------
3 files changed, 23 insertions(+), 21 deletions(-)
New commits:
commit fb74d44a1400c64e1b97c0d42b9facc1453bf974
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Aug 6 14:07:27 2009 -0400
adding newest fedora gpg key, and moving _data sql file to the right place
diff --git a/schema/spacewalk/common/data/rhnContentSourceType.sql b/schema/spacewalk/common/data/rhnContentSourceType.sql
new file mode 100644
index 0000000..83b84d5
--- /dev/null
+++ b/schema/spacewalk/common/data/rhnContentSourceType.sql
@@ -0,0 +1,21 @@
+--
+-- Copyright (c) 2008 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+--
+--
+--
+--
+
+insert into rhnContentSourceType (id, label) values
+(rhn_content_source_type_id_seq.nextval, 'yum');
+
diff --git a/schema/spacewalk/common/data/rhnPackageKey.sql b/schema/spacewalk/common/data/rhnPackageKey.sql
index ae07f17..f18024a 100644
--- a/schema/spacewalk/common/data/rhnPackageKey.sql
+++ b/schema/spacewalk/common/data/rhnPackageKey.sql
@@ -47,6 +47,8 @@ insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
(rhn_pkey_id_seq.nextval, 'a84edae89c800aca', lookup_package_key_type('gpg'), lookup_package_provider('Suse'));
+insert into rhnPackageKey (id, key_id, key_type_id, provider_id) values
+(rhn_pkey_id_seq.nextval, '1dc5c758d22e77f2', lookup_package_key_type('gpg'), lookup_package_provider('Fedora'));
diff --git a/schema/spacewalk/common/tables/rhnContentSourceType_data.sql b/schema/spacewalk/common/tables/rhnContentSourceType_data.sql
deleted file mode 100644
index db3424c..0000000
--- a/schema/spacewalk/common/tables/rhnContentSourceType_data.sql
+++ /dev/null
@@ -1,21 +0,0 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
--- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
---
---
---
-
-insert into rhnContentSourceType (id, label) values
-(rhn_content_source_type_id_seq.nextval, 'yum');
-
14 years, 9 months