monitoring/NPalert rel-eng/packages
by Jan Pazdziora
monitoring/NPalert/NPalert.spec | 5 ++++-
rel-eng/packages/NPalert | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6310cfa1c5a679c09985191d76a802dc560b6028
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 18:06:45 2011 +0100
Automatic commit of package [NPalert] release [1.126.18-1].
diff --git a/monitoring/NPalert/NPalert.spec b/monitoring/NPalert/NPalert.spec
index bd1a84e..32f832b 100644
--- a/monitoring/NPalert/NPalert.spec
+++ b/monitoring/NPalert/NPalert.spec
@@ -9,7 +9,7 @@ Name: NPalert
Summary: NOCpulse notification system
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.126.17
+Version: 1.126.18
Release: 1%{?dist}
BuildArch: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -135,6 +135,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jan 25 2011 Jan Pazdziora 1.126.18-1
+- 493028 - simplified email check regexp (michael.mraka(a)redhat.com)
+
* Sat Nov 20 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.126.17-1
- 474591 - move web data to /usr/share/nocpulse (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/NPalert b/rel-eng/packages/NPalert
index 81ba97e..d141ed8 100644
--- a/rel-eng/packages/NPalert
+++ b/rel-eng/packages/NPalert
@@ -1 +1 @@
-1.126.17-1 monitoring/NPalert/
+1.126.18-1 monitoring/NPalert/
13 years, 3 months
backend/server
by Milan Zazrivec
backend/server/rhnServer/server_lib.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 28f6921e68b5278ab5cdf640f5367e78ddf9bfef
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Jan 25 18:02:27 2011 +0100
make osa ping work properly again
This is to address server side problem:
'ORA-00911: invalid character\n', 911, 'update rhnPushClient set
jabber_id = :jid,
+next_action_time = NULL, last_ping_time = NULL where server_id =
:server_id;'
propagated as an ISE to osad (and silently ignored).
diff --git a/backend/server/rhnServer/server_lib.py b/backend/server/rhnServer/server_lib.py
index 5dbdc9e..fa96a61 100644
--- a/backend/server/rhnServer/server_lib.py
+++ b/backend/server/rhnServer/server_lib.py
@@ -354,7 +354,7 @@ _query_update_push_client_jid = rhnSQL.Statement("""
set jabber_id = :jid,
next_action_time = NULL,
last_ping_time = NULL
- where server_id = :server_id;
+ where server_id = :server_id
""")
def update_push_client_jid(server_id, jid):
h = rhnSQL.prepare(_query_update_push_client_jid)
13 years, 3 months
Changes to 'refs/tags/spacewalk-schema-1.3.17-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.3.17-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-01-25 17:03 +0000
Tagging package [spacewalk-schema] version [1.3.17-1] in directory [schema/spacewalk/].
Changes since spacewalk-setup-1.3.9-1:
Jan Pazdziora (11):
Adding rhn_org PostgreSQL schema upgrade scripts.
Adding rhn_package PostgreSQL schema upgrade script (dropping the schema).
Adding rhn_user PostgreSQL schema upgrade scripts.
Adding rhn_channel PostgreSQL schema upgrade script.
Adding rhn_entitlement PostgreSQL schema upgrade script.
Adding rpm (vercmp) PostgreSQL schema upgrade script.
Empty schema upgrade on PostgreSQL for channel_name_t and channel_name_join.
Fixing next if which was on bad place.
Update schema-source-sanity-check.pl to process schema upgrades as well.
Modify the type of rhnPackage.build_time upon upgrade, on PostgreSQL.
Automatic commit of package [spacewalk-schema] release [1.3.17-1].
Miroslav Suchý (2):
648403 - workaround missing hasCapability() on RHEL4
581482 - make tui consistent with gui
---
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 16 -
client/tools/rhnpush/rhnpush.spec | 4
client/tools/rhnpush/uploadLib.py | 21 +
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/schema-source-sanity-check.pl | 31 +-
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/004-rhn_channel-body.sql.postgresql | 25 +
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/005-rhn_package-drop.sql.postgresql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/006-rhn_org.sql.postgresql | 11
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/007-rhn_org-body.sql.postgresql | 138 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/008-channel_name_join-drop.sql.postgresql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/009-channel_name_t-drop.sql.postgresql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/010-rpm.sql.postgresql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/011-rpm-body.sql.postgresql | 35 ++
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql.postgresql | 12
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql.postgresql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/014-rhn_entitlement_pkb.sql.postgresql | 81 +++++
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/016-rhnpackage-build_time-type.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/016-rhnpackage-build_time-type.sql.postgresql | 79 +++++
19 files changed, 455 insertions(+), 22 deletions(-)
---
13 years, 3 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f2554d87cf910f489f07829403cf52ffa6ae7f87
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 18:03:33 2011 +0100
Automatic commit of package [spacewalk-schema] release [1.3.17-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index bf1b20b..3a24ff1 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.3.16-1 schema/spacewalk/
+1.3.17-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 5335c17..0ece577 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.3.16
+Version: 1.3.17
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue Jan 25 2011 Jan Pazdziora 1.3.17-1
+- Add PostgreSQL schema upgrade scripts for 1.2 -> 1.3 upgrade.
+
* Fri Jan 21 2011 Jan Pazdziora 1.3.16-1
- The evr_t_as_vre_simple is not available on old Spacewalks, fixed.
13 years, 3 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/016-rhnpackage-build_time-type.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/016-rhnpackage-build_time-type.sql.postgresql | 79 ++++++++++
2 files changed, 80 insertions(+)
New commits:
commit ced436451a79cacf59314872d30def8fdfc742c0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 18:01:14 2011 +0100
Modify the type of rhnPackage.build_time upon upgrade, on PostgreSQL.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/016-rhnpackage-build_time-type.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/016-rhnpackage-build_time-type.sql.oracle
new file mode 100644
index 0000000..b7b00b1
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/016-rhnpackage-build_time-type.sql.oracle
@@ -0,0 +1 @@
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/016-rhnpackage-build_time-type.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/016-rhnpackage-build_time-type.sql.postgresql
new file mode 100644
index 0000000..1229ce0
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/016-rhnpackage-build_time-type.sql.postgresql
@@ -0,0 +1,79 @@
+-- oracle equivalent source sha1 b14267384bc104605623a41b755e68e0103b5aa8
+
+-- The drop is needed to avoid
+-- ERROR: cannot alter type of a column used by a view or rule
+-- DETAIL: rule _RETURN on view rhnserverneededview depends on column "build_time"
+-- in the alter table command.
+
+drop view rhnserverneededview;
+
+alter table rhnpackage alter build_time type timestamp without time zone ;
+
+-- recreating the view
+create or replace view
+rhnServerNeededView
+(
+ org_id,
+ server_id,
+ errata_id,
+ package_id,
+ package_name_id,
+ channel_id
+)
+as
+select s.org_id,
+ s.id as server_id,
+ pce.errata_id,
+ pkg.id as package_id,
+ neededpkg.name_id as package_name_id,
+ scp.min_channel_id as channel_id
+ from (select sc.server_id, np.name_id, np.package_arch_id, max(np.evr) max_evr
+ from (-- list of newest packages in channels with EVR
+ select np_np.*, np_pe.evr
+ from rhnChannelNewestPackage np_np
+ join rhnPackageEVR np_pe
+ on np_pe.id = np_np.evr_id) np
+ join (-- list of packages on the server with EVR
+ select sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id, max(sp_pe.evr) as max_evr
+ from rhnServerPackage sp_sp
+ join rhnPackageEVR sp_pe
+ on sp_pe.id = sp_sp.evr_id
+ group by sp_sp.server_id, sp_sp.name_id, sp_sp.package_arch_id) sp
+ on -- at first - we want only newer (=higher EVR) packages than there are on the server
+ sp.name_id = np.name_id and sp.max_evr < np.evr
+ join -- secondly - packages must be upgrade compatible
+ rhnPackageUpgradeArchCompat puac
+ on puac.package_arch_id = sp.package_arch_id and puac.package_upgrade_arch_id = np.package_arch_id
+ join -- thirdly - packages must be in channel where server is subscribed to
+ rhnServerChannel sc
+ on sc.server_id = sp.server_id and sc.channel_id = np.channel_id
+ group by sc.server_id, np.name_id, np.package_arch_id
+ ) neededpkg
+ join -- lookup org_id by server
+ rhnServer s
+ on neededpkg.server_id = s.id
+ join (--lookup package_id by max_evr, name and package_arch
+ select p.*, p_evr.evr
+ --
+ , p_evr.release, p_evr.version, p_evr.epoch
+ from rhnPackage p
+ join rhnPackageEVR p_evr
+ on p_evr.id = p.evr_id) pkg
+ on pkg.evr = neededpkg.max_evr
+ and pkg.name_id = neededpkg.name_id
+ and pkg.package_arch_id = neededpkg.package_arch_id
+ join (-- lookup channel_id - we want only one id eve if package is in more channels
+ -- so pick lowest one
+ select cp.package_id, csc.server_id, min(cp.channel_id) as min_channel_id
+ from rhnChannelPackage cp
+ join rhnServerChannel csc
+ on csc.channel_id = cp.channel_id
+ group by cp.package_id, csc.server_id) scp
+ on scp.package_id = pkg.id and scp.server_id = neededpkg.server_id
+ left join (-- lookup errata id (can be NULL)
+ select ep.package_id, ce.errata_id, ce.channel_id
+ from rhnErrataPackage ep
+ join rhnChannelErrata ce
+ on ce.errata_id = ep.errata_id) pce
+ on pce.package_id = pkg.id and pce.channel_id = scp.min_channel_id
+;
13 years, 3 months
9 commits - schema/spacewalk
by Jan Pazdziora
schema/spacewalk/schema-source-sanity-check.pl | 31 +-
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/004-rhn_channel-body.sql.postgresql | 25 +
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/005-rhn_package-drop.sql.postgresql | 4
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/006-rhn_org.sql.postgresql | 11
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/007-rhn_org-body.sql.postgresql | 138 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/008-channel_name_join-drop.sql.postgresql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/009-channel_name_t-drop.sql.postgresql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/010-rpm.sql.postgresql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/011-rpm-body.sql.postgresql | 35 ++
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql.postgresql | 12
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql.postgresql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/014-rhn_entitlement_pkb.sql.postgresql | 81 +++++
12 files changed, 338 insertions(+), 11 deletions(-)
New commits:
commit ce4e235db8e3801a96490b519297572b38083cfa
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 16:33:27 2011 +0100
Update schema-source-sanity-check.pl to process schema upgrades as well.
diff --git a/schema/spacewalk/schema-source-sanity-check.pl b/schema/spacewalk/schema-source-sanity-check.pl
index bcc4ff7..e4bbbe5 100644
--- a/schema/spacewalk/schema-source-sanity-check.pl
+++ b/schema/spacewalk/schema-source-sanity-check.pl
@@ -11,7 +11,7 @@ my %files;
my $show_ignored = 0;
Getopt::Long::GetOptions('I' => \$show_ignored) or exit 9;
-for my $dir (qw( common oracle postgres )) {
+for my $dir (qw( common oracle postgres upgrade )) {
File::Find::find(sub {
my $name = $File::Find::name;
if ($name eq $dir) {
@@ -23,8 +23,17 @@ for my $dir (qw( common oracle postgres )) {
if (substr($name, 0, length($dir) + 1) ne "$dir/") {
die "In dir [$dir] we got [$name]\n";
}
- my $rname = substr($name, length($dir) + 1);
- $files{$dir}{$rname} = $_;
+ if ($dir eq 'upgrade') {
+ my $generic = $name;
+ if ($generic =~ s/\.(oracle|postgresql)$//) {
+ my $db = $1;
+ $db = 'postgres' if $db eq 'postgresql';
+ $files{$db}{$generic} = $name;
+ }
+ } else {
+ my $rname = substr($name, length($dir) + 1);
+ $files{$dir}{$rname} = $name;
+ }
}, $dir);
}
@@ -50,15 +59,15 @@ for my $c (sort keys %{ $files{oracle} }) {
for my $c (sort keys %{ $files{postgres} }) {
next unless $c =~ /\.(sql|pks|pkb)$/;
local *FILE;
- open FILE, "postgres/$c" or do {
- print "Error reading postgres/$c: $!\n";
+ open FILE, '<', $files{postgres}{$c} or do {
+ print "Error reading [$files{postgres}{$c}]: $!\n";
$error = 1;
next;
};
my $first_line = <FILE>;
close FILE;
- if (not $first_line =~ /^-- oracle equivalent source (?:(none)|sha1 ([0-9a-f]{40}))$/) {
- print "File postgres/$c does not specify SHA1 of Oracle source nor none\n" if $show_ignored;
+ if (not defined $first_line or not $first_line =~ /^-- oracle equivalent source (?:(none)|sha1 ([0-9a-f]{40}))$/) {
+ print "PostgreSQL file [$c] does not specify SHA1 of Oracle source nor none\n" if $show_ignored;
# $error = 1;
next;
}
@@ -76,8 +85,8 @@ for my $c (sort keys %{ $files{postgres} }) {
$error = 1;
next;
}
- open FILE, "oracle/$c" or do {
- print "Error reading oracle/$c to verify SHA1: $!\n";
+ open FILE, '<', $files{oracle}{$c} or do {
+ print "Error reading Oracle [$files{oracle}{$c}] to verify SHA1: $!\n";
$error = 1;
next;
};
@@ -86,7 +95,7 @@ for my $c (sort keys %{ $files{postgres} }) {
my $sha1_hex = $sha1->hexdigest();
close FILE;
if ($oracle_sha1 ne $sha1_hex) {
- print "File postgres/$c says SHA1 of Oracle source should be [$oracle_sha1] but it is [$sha1_hex]\n";
+ print "PostgreSQL file [$c] says SHA1 of Oracle source should be [$oracle_sha1] but it is [$sha1_hex]\n";
$error = 1;
}
}
commit 9af02e5c93bbb0a3d8cbf6f1be5327f8bc14fae6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 17:28:26 2011 +0100
Fixing next if which was on bad place.
diff --git a/schema/spacewalk/schema-source-sanity-check.pl b/schema/spacewalk/schema-source-sanity-check.pl
index 252eab0..bcc4ff7 100644
--- a/schema/spacewalk/schema-source-sanity-check.pl
+++ b/schema/spacewalk/schema-source-sanity-check.pl
@@ -30,8 +30,8 @@ for my $dir (qw( common oracle postgres )) {
my $error = 0;
for my $c (sort keys %{ $files{common} }) {
+ next unless $c =~ /\.(sql|pks|pkb)$/;
for my $o (qw( oracle postgres )) {
- next unless $o =~ /\.(sql|pks|pkb)$/;
if (exists $files{$o}{$c}) {
print "Common file [$c] is also in $o\n";
$error = 1;
commit 696e48a49d84f1d69c4f8b5ae068462bd3781381
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 16:18:45 2011 +0100
Empty schema upgrade on PostgreSQL for channel_name_t and channel_name_join.
They did not exist on PostgreSQL, so no schema upgrade needed, just
putting it in here to make counterpart for the .oracle files.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/008-channel_name_join-drop.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/008-channel_name_join-drop.sql.postgresql
new file mode 100644
index 0000000..cae4024
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/008-channel_name_join-drop.sql.postgresql
@@ -0,0 +1,3 @@
+-- oracle equivalent source sha1 412e8302446320f3117deeb7415ad18e91be1191
+--
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/009-channel_name_t-drop.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/009-channel_name_t-drop.sql.postgresql
new file mode 100644
index 0000000..0fc465f
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/009-channel_name_t-drop.sql.postgresql
@@ -0,0 +1,3 @@
+-- oracle equivalent source sha1 1e792602606d4063c6f684c0100b241aeaf34165
+--
+-- This file is intentionally left empty.
commit 347b391b630e3e5ff927941aef69207a477bb880
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 16:13:49 2011 +0100
Adding rpm (vercmp) PostgreSQL schema upgrade script.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/010-rpm.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/010-rpm.sql.postgresql
new file mode 100644
index 0000000..d58038c
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/010-rpm.sql.postgresql
@@ -0,0 +1,3 @@
+-- oracle equivalent source sha1 1f8b5508a1d7ce29135f848b78b6564d005747b8
+--
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/011-rpm-body.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/011-rpm-body.sql.postgresql
new file mode 100644
index 0000000..de5041d
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/011-rpm-body.sql.postgresql
@@ -0,0 +1,35 @@
+-- oracle equivalent source sha1 625d2c9b448240a736f369e7b53a386ce9c1f28a
+
+--update pg_setting
+update pg_settings set setting = 'rpm,' || setting where name = 'search_path';
+
+ create or replace FUNCTION vercmp(
+ e1 VARCHAR, v1 VARCHAR, r1 VARCHAR,
+ e2 VARCHAR, v2 VARCHAR, r2 VARCHAR)
+ RETURNS INTEGER as $$
+ declare
+ rc INTEGER;
+ ep1 INTEGER;
+ ep2 INTEGER;
+ BEGIN
+ if e1 is null or e1 = '' then
+ ep1 := 0;
+ else
+ ep1 := e1::integer;
+ end if;
+ if e2 is null or e2 = '' then
+ ep2 := 0;
+ else
+ ep2 := e2::integer;
+ end if;
+ -- Epochs are non-null; compare them
+ if ep1 < ep2 then return -1; end if;
+ if ep1 > ep2 then return 1; end if;
+ rc := rpm.rpmstrcmp(v1, v2);
+ if rc != 0 then return rc; end if;
+ return rpm.rpmstrcmp(r1, r2);
+ END;
+ $$ language 'plpgsql';
+
+-- restore the original setting
+update pg_settings set setting = overlay( setting placing '' from 1 for (length('rpm')+1) ) where name = 'search_path';
commit cc92b73777ec6b64609ee9b48b25100c154cd953
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 16:09:41 2011 +0100
Adding rhn_entitlement PostgreSQL schema upgrade script.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/014-rhn_entitlement_pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/014-rhn_entitlement_pkb.sql.postgresql
new file mode 100644
index 0000000..7102902
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/014-rhn_entitlement_pkb.sql.postgresql
@@ -0,0 +1,81 @@
+-- oracle equivalent source sha1 16f4e58f383e0a61bf752b1a99a31a86780659dd
+--
+-- Copyright (c) 2011 Red Hat, Inc.
+
+-- setup search_path so that these functions are created in appropriate schema.
+update pg_settings set setting = 'rhn_entitlements,' || setting where name = 'search_path';
+
+ create or replace function set_customer_enterprise (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'enterprise', 'Y');
+ end$$
+language plpgsql;
+
+ create or replace function set_customer_provisioning (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'provisioning', 'Y');
+ end$$
+language plpgsql;
+
+ create or replace function set_customer_monitoring (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'monitoring', 'Y');
+ end$$
+language plpgsql;
+
+ create or replace function set_customer_nonlinux (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'nonlinux', 'Y');
+ end$$
+language plpgsql;
+
+ create or replace function unset_customer_enterprise (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'enterprise', 'N');
+ end$$
+language plpgsql;
+
+ create or replace function unset_customer_provisioning (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'provisioning', 'N');
+ end$$
+language plpgsql;
+
+ create or replace function unset_customer_monitoring (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'monitoring', 'N');
+ end$$
+language plpgsql;
+
+ create or replace function unset_customer_nonlinux (
+ customer_id_in in numeric
+ ) returns void
+as $$
+ begin
+ perform rhn_entitlements.modify_org_service(customer_id_in, 'nonlinux', 'N');
+ end$$
+language plpgsql;
+
+-- restore the original setting
+update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_entitlements')+1) ) where name = 'search_path';
commit f0a84995f13e82af5fc74ea02baf67ffd319c55f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 16:02:53 2011 +0100
Adding rhn_channel PostgreSQL schema upgrade script.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/004-rhn_channel-body.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/004-rhn_channel-body.sql.postgresql
new file mode 100644
index 0000000..eb387bc
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/004-rhn_channel-body.sql.postgresql
@@ -0,0 +1,25 @@
+-- oracle equivalent source sha1 9d36eb7011645e0a66b8e357f196393b63c1024e
+--
+-- Copyright (c) 2011 Red Hat, Inc.
+
+--update pg_setting
+update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_path';
+
+ create or replace function can_server_consume_fve(server_id_in in numeric) returns numeric
+ as $$
+ declare
+ vi_entries cursor for
+ SELECT 1
+ FROM rhnVirtualInstance vi
+ WHERE vi.virtual_system_id = server_id_in;
+ vi_count numeric;
+
+ begin
+ FOR vi_entry IN VI_ENTRIES LOOP
+ return 1;
+ END LOOP;
+ RETURN 0;
+ end$$ language plpgsql;
+
+-- restore the original setting
+update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_channel')+1) ) where name = 'search_path';
commit 97235a402afbc30b7e34d6c65951e8a53c558b08
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 14:29:01 2011 +0100
Adding rhn_user PostgreSQL schema upgrade scripts.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql.postgresql
new file mode 100644
index 0000000..b80bb06
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/012-rhn_user.sql.postgresql
@@ -0,0 +1,12 @@
+-- oracle equivalent source sha1 054658f16439e0bb3772d52b90edd7a1e7b4feff
+--
+-- Copyright (c) 2011 Red Hat, Inc.
+
+-- setup search_path so that these functions are created in appropriate schema.
+update pg_settings set setting = 'rhn_user,' || setting where name = 'search_path';
+
+drop function add_users_to_usergroups(user_id_in in numeric);
+drop function remove_users_from_servergroups(user_id_in in numeric);
+
+-- restore the original setting
+update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_user')+1) ) where name = 'search_path';
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql.postgresql
new file mode 100644
index 0000000..61f2d7b
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/013-rhn_user-body.sql.postgresql
@@ -0,0 +1,3 @@
+-- oracle equivalent source sha1 2e392775c7d2f4fda07a71107958ce84c38c874c
+
+-- This file is intentionally left empty.
commit fde90b97b97e3141048f326c7f6fa95303838ed3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 14:28:25 2011 +0100
Adding rhn_package PostgreSQL schema upgrade script (dropping the schema).
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/005-rhn_package-drop.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/005-rhn_package-drop.sql.postgresql
new file mode 100644
index 0000000..888e3b6
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/005-rhn_package-drop.sql.postgresql
@@ -0,0 +1,4 @@
+-- oracle equivalent source sha1 a89010cda37aa555d62ea4cb5e543cf25134b21a
+
+drop schema rhn_package cascade;
+
commit 8dbbe1aae49d875b4b05bb5dac6ca1c2176deeab
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 25 14:26:05 2011 +0100
Adding rhn_org PostgreSQL schema upgrade scripts.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/006-rhn_org.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/006-rhn_org.sql.postgresql
new file mode 100644
index 0000000..272d83d
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/006-rhn_org.sql.postgresql
@@ -0,0 +1,11 @@
+-- oracle equivalent source sha1 f19b747e0d9e2f2db3745679cdb0397e2be64650
+--
+-- Copyright (c) 2011 Red Hat, Inc.
+
+-- setup search_path so that these functions are created in appropriate schema.
+update pg_settings set setting = 'rhn_org,' || setting where name = 'search_path';
+
+drop function find_server_group_by_type(org_id_in NUMERIC, group_label_in VARCHAR);
+
+-- restore the original setting
+update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_org')+1) ) where name = 'search_path';
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/007-rhn_org-body.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/007-rhn_org-body.sql.postgresql
new file mode 100644
index 0000000..4ac7858
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.2-to-spacewalk-schema-1.3/007-rhn_org-body.sql.postgresql
@@ -0,0 +1,138 @@
+-- oracle equivalent source sha1 78ceb7a44befb2120e46a7d40ac1cd32f1227f06
+--
+-- Copyright (c) 2011 Red Hat, Inc.
+
+-- setup search_path so that these functions are created in appropriate schema.
+update pg_settings set setting = 'rhn_org,' || setting where name = 'search_path';
+
+create or replace function delete_user(user_id_in in numeric, deleting_org in numeric default 0) returns void
+ as
+ $$
+ declare
+ servergroups_needing_admins cursor for
+ select usgp.server_group_id server_group_id
+ from rhnUserServerGroupPerms usgp
+ where 1=1
+ and usgp.user_id = user_id_in
+ and not exists (
+ select 1
+ from rhnUserServerGroupPerms sq_usgp
+ where 1=1
+ and sq_usgp.server_group_id = usgp.server_group_id
+ and sq_usgp.user_id != user_id_in
+ );
+ users numeric;
+ our_org_id numeric;
+ other_users numeric;
+ other_org_admin numeric;
+ other_user_id numeric;
+ is_admin numeric;
+ begin
+ select wc.org_id
+ into our_org_id
+ from web_contact wc
+ where id = user_id_in;
+
+ -- find any other users
+ begin
+ select id, 1
+ into other_user_id, other_users
+ from web_contact
+ where 1=1
+ and org_id = our_org_id
+ and id != user_id_in
+ limit 1;
+ exception
+ when no_data_found then
+ other_users := 0;
+ end;
+
+ -- now do org admin stuff
+ if other_users != 0 then
+ -- is user admin?
+ select count(1)
+ into is_admin
+ from rhnUserGroupType ugt,
+ rhnUserGroup ug,
+ rhnUserGroupMembers ugm
+ where ugm.user_id = user_id_in
+ and ugm.user_group_id = ug.id
+ and ug.group_type = ugt.id
+ and ugt.label = 'org_admin';
+ if is_admin > 0 then
+ begin
+ select new_ugm.user_id
+ into other_org_admin
+ from rhnUserGroupMembers new_ugm,
+ rhnUserGroupType ugt,
+ rhnUserGroup ug,
+ rhnUserGroupMembers ugm
+ where ugm.user_id = user_id_in
+ and ugm.user_group_id = ug.id
+ and ug.group_type = ugt.id
+ and ugt.label = 'org_admin'
+ and ug.id = new_ugm.user_group_id
+ and new_ugm.user_id != user_id_in
+ limit 1;
+ exception
+ when no_data_found then
+ -- If we're deleting the org, we don't want to raise
+ -- the exception.
+ if deleting_org = 0 then
+ perform rhn_exception.raise_exception('cannot_delete_user');
+ end if;
+ end;
+
+ for sg in servergroups_needing_admins loop
+ perform rhn_user.add_servergroup_perm(other_org_admin,
+ sg.server_group_id);
+ end loop;
+ end if;
+ end if;
+
+ -- and now things for every user
+ delete from rhn_command_queue_sessions where contact_id = user_id_in;
+ delete from rhn_contact_groups
+ where recid in (
+ select contact_group_id
+ from rhn_contact_group_members
+ where member_contact_method_id in (
+ select recid from rhn_contact_methods
+ where contact_id = user_id_in
+ )
+ )
+ and not exists (
+ select 1
+ from rhn_contact_group_members, rhn_contact_methods
+ where rhn_contact_groups.recid = rhn_contact_group_members.contact_group_id
+ and rhn_contact_group_members.member_contact_method_id = rhn_contact_methods.recid
+ and rhn_contact_methods.contact_id <> user_id_in
+ );
+ delete from rhn_contact_methods where contact_id = user_id_in;
+ delete from rhn_redirects where contact_id = user_id_in;
+ delete from rhnUserServerPerms where user_id = user_id_in;
+ delete from rhnAppInstallSession where user_id = user_id_in;
+ update rhnConfigRevision
+ set changed_by_id = NULL
+ where changed_by_id = user_id_in;
+ if other_users != 0 then
+ update rhnRegToken
+ set user_id = coalesce(other_org_admin, other_user_id)
+ where org_id = our_org_id
+ and user_id = user_id_in;
+ end if;
+
+ begin
+ delete from web_contact where id = user_id_in;
+ exception
+ when others then
+ perform rhn_exception.raise_exception('cannot_delete_user');
+ end;
+ return;
+
+ end;
+ $$
+ language plpgsql;
+
+-- restore the original setting
+update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_org')+1) ) where name = 'search_path';
13 years, 3 months
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 16 +++++-----
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 0a19fb30018fa50ff61c5c144c00855a54104466
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jan 25 14:21:44 2011 +0100
581482 - make tui consistent with gui
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index 044c3f6..c8f97d9 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -19,7 +19,7 @@ CONNECT_WINDOW_TEXT = _("We are attempting to contact the Red Hat "
CONNECT_WINDOW_TEXT2 = _("A proxy was specified at %s.")
# Start Window
-START_REGISTER_WINDOW = _("Setting up Software updates")
+START_REGISTER_WINDOW = _("Registering for software updates")
START_REGISTER_TEXT = _("This assistant will guide you through "
"connecting your system to "
"Red Hat Network (RHN) to receive software "
@@ -34,7 +34,7 @@ START_REGISTER_TEXT = _("This assistant will guide you through "
# Why Register Window
WHY_REGISTER = _("Why Should I Connect to RHN? ...")
-WHY_REGISTER_WINDOW = _("Why connect to Red Hat Network?")
+WHY_REGISTER_WINDOW = _("Why Register")
WHY_REGISTER_TEXT = _("Connecting your system to Red Hat Network allows you to take full "
"advantage of the benefits of a paid subscription, including:")
WHY_REGISTER_SEC = _("Security & Updates:")
@@ -53,7 +53,7 @@ WHY_REGISTER_COMP_TXT = _("Stay in compliance with your subscription agreement "
"http://rhn.redhat.com/.")
WHY_REGISTER_TIP = _("Tip: Red Hat values your privacy: "
"http://www.redhat.com/legal/privacy_statement.html")
-BACK_REGISTER = _("Take me back to the setup process.")
+BACK_REGISTER = _("Take me back to the registration")
# Confirm Quit Window
CONFIRM_QUIT = _("Software update setup unsuccessful")
@@ -65,7 +65,7 @@ CONTINUE_REGISTERING = _("Take me back to the setup process.")
REGISTER_LATER2 = _("I'll register later.")
# Info Window
-REGISTER_WINDOW = _("Setting up software updates")
+REGISTER_WINDOW = _("Enter you account information")
LOGIN_PROMPT = _("Please enter your login information for the %s Red "
"Hat Network Satellite:\n\n")
HOSTED_LOGIN = _("Red Hat Login:")
@@ -77,7 +77,7 @@ USER_REQUIRED = _("Please enter a desired login.")
PASSWORD_REQUIRED = _("Please enter and verify a password.")
# OS Release Window
-SELECT_OSRELEASE = _("Select Operating System Release")
+SELECT_OSRELEASE = _("Select operating system release")
OS_VERSION = _("Operating System version:")
MINOR_RELEASE = _(" Minor Release: ")
LIMITED_UPDATES = _("Limited Updates Only")
@@ -88,7 +88,7 @@ CONFIRM_OS_ALL = _("Your system will be subscribed to the base"
" updates.")
# Hardware Window
-HARDWARE_WINDOW = _("Register a System Profile - Hardware")
+HARDWARE_WINDOW = _("Create your system profile - Hardware")
HARDWARE_WINDOW_DESC1 = _("A Profile Name is a descriptive name that"
" you choose to identify this System Profile"
" on the Red Hat Network web pages. Optionally,"
@@ -100,13 +100,13 @@ HARDWARE_WINDOW_CHECKBOX = _("Include the following information about hardware"
" and network:")
# Packages Window
-PACKAGES_WINDOW = _("Register a System Profile - Packages")
+PACKAGES_WINDOW = _("Create your system profile - Packages")
PACKAGES_WINDOW_DESC1 = _("RPM information is important to determine what"
" updated software packages are relevant to this"
" system.")
PACKAGES_WINDOW_DESC2 = _("Include RPM packages installed on this system"
" in my System Profile")
-PACKAGES_WINDOW_UNCHECK = _("You may deselect individual packages by"
+PACKAGES_WINDOW_UNCHECK = _("You may deselect individua l packages by"
" unchecking them below.")
PACKAGES_WINDOW_PKGLIST = _("Building Package List")
13 years, 3 months
client/tools
by Miroslav Suchý
client/tools/rhnpush/rhnpush.spec | 4 ++++
client/tools/rhnpush/uploadLib.py | 21 ++++++++++++++++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
New commits:
commit 7850cb478d0947f497c262e28792974c86806434
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jan 25 13:16:13 2011 +0100
648403 - workaround missing hasCapability() on RHEL4
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index c52f32e..fe155ba 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -12,7 +12,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: rpm-python, rhnlib
Requires: spacewalk-backend-libs >= 0.8.3
+%if 0%{?rhel} && 0%{?rhel} <= 5
+Requires: up2date
+%else
Requires: rhn-client-tools
+%endif
BuildRequires: docbook-utils, gettext
Summary: Package uploader for the Red Hat Network Satellite Server
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index cb2cbbe..e43a0fc 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -710,6 +710,21 @@ def getServer(uri, proxy=None, username=None, password=None, ca_chain=None):
s.add_trusted_cert(ca_chain)
return s
+def __hasCapability(self, capability, version=None):
+ """Checks if the server supports a capability and optionally a version.
+ Returns True or False.
+ Copy from client/rhel/rhn-client-tools/src/up2date_client/capabilities.py
+ """
+ assert version is None or str(version).isdigit()
+
+ if not self.data.has_key(capability):
+ return False
+ if version:
+ data = self.data[capability]
+ if int(version) not in self.parseCapVersion(data['version']):
+ return False
+ return True
+
def exists_getPackageChecksumBySession(rpc_server):
""" check whether server supports getPackageChecksumBySession function"""
# unfortunatelly we do not have capability for getPackageChecksumBySession function,
@@ -717,7 +732,11 @@ def exists_getPackageChecksumBySession(rpc_server):
# lets use it instead
server = rhnserver.RhnServer()
server._server = rpc_server
- return server.capabilities.hasCapability('xmlrpc.packages.extended_profile', 2)
+ try:
+ result = server.capabilities.hasCapability('xmlrpc.packages.extended_profile', 2)
+ except AttributeError: # workaround for rhel4
+ result = __hasCapability(server.capabilities, 'xmlrpc.packages.extended_profile', 2)
+ return result
# compare two package [n,v,r,e] tuples
def packageCompare(pkg1, pkg2, is_mpm=None):
13 years, 3 months
Changes to 'refs/tags/spacewalk-setup-1.3.9-1'
by Michael Mraka
Tag 'spacewalk-setup-1.3.9-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-01-25 10:09 +0000
Tagging package [spacewalk-setup] version [1.3.9-1] in directory [spacewalk/setup/].
Changes since spacewalk-backend-1.3.48-1:
Michael Mraka (2):
636458 - reuse db version check via dbms_utility.db_version()
Automatic commit of package [spacewalk-setup] release [1.3.9-1].
---
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/lib/Spacewalk/Setup.pm | 21 ++++++---------------
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
3 files changed, 12 insertions(+), 17 deletions(-)
---
13 years, 3 months
rel-eng/packages spacewalk/setup
by Michael Mraka
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 08967a7af6b146b2342fb5c58f01df3bba9a24c2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 25 11:09:38 2011 +0100
Automatic commit of package [spacewalk-setup] release [1.3.9-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 41e0f03..e8ce50d 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.3.8-1 spacewalk/setup/
+1.3.9-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 4a4980f..9d1e132 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.3.8
+Version: 1.3.9
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -101,6 +101,10 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Tue Jan 25 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.3.9-1
+- 636458 - reuse db version check via dbms_utility.db_version()
+- updating Copyright years for year 2011
+
* Wed Jan 19 2011 Jan Pazdziora 1.3.8-1
- Call spacewalk-sql instead of rhn-populate-database.pl.
13 years, 3 months