Branch 'SPACEWALK-1.4' - 3 commits - client/tools rel-eng/packages rel-eng/push-packages-to-fedora.sh

[Miroslav Suchý]

 client/tools/osad/osad.spec        |    5 ++++-
 client/tools/osad/src/osad.py      |    1 +
 rel-eng/packages/osad              |    2 +-
 rel-eng/push-packages-to-fedora.sh |    2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 3f4608b85d2ce46b343a4a3fe733c294c2f8cd39
Author: Miroslav Suchý <msuchy(a)redhat.com&gt;
Date:   Fri Apr 29 16:23:33 2011 +0200

    Automatic commit of package [osad] release [5.10.14-1].

diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index cc96ef2..0ad151f 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -9,7 +9,7 @@ Group:   System Environment/Daemons
 License: GPLv2
 URL:     https://fedorahosted.org/spacewalk
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.9
+Version: 5.10.14
 Release: 1%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -228,6 +228,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
 %attr(0755,root,root) %{_sbindir}/osa-dispatcher-selinux-enable
 
 %changelog
+* Fri Apr 29 2011 Miroslav Suchý 5.10.14-1
+- provide config
+
 * Fri Apr 08 2011 Miroslav Suchý 5.10.9-1
 - Revert "idn_unicode_to_pune() have to return string" (msuchy(a)redhat.com)
 - update copyright years (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index c911519..1204d96 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.9-1 client/tools/osad/
+5.10.14-1 client/tools/osad/


commit d71150b1f9c7cf31db222342705613631f54e9c9
Author: Michael Calmer <mc(a)suse.de&gt;
Date:   Fri Apr 15 13:16:04 2011 +0200

    provide config
    (cherry picked from commit 39f768dc06eb56c115bc02d660929ab55bab4148)

diff --git a/client/tools/osad/src/osad.py b/client/tools/osad/src/osad.py
index 6c2b699..1cb89ba 100644
--- a/client/tools/osad/src/osad.py
+++ b/client/tools/osad/src/osad.py
@@ -22,6 +22,7 @@ from rhn import rpclib
 import random
 
 from up2date_client.config import initUp2dateConfig
+from up2date_client import config
 
 from rhn_log import set_debug_level, log_debug, die, set_logfile
 


commit 85543e2341f463f691d9d0a71e57ef7e7419ede6
Author: Miroslav Suchý <msuchy(a)redhat.com&gt;
Date:   Tue Apr 26 14:20:13 2011 +0200

    push to fedora packages which already pass package review

diff --git a/rel-eng/push-packages-to-fedora.sh b/rel-eng/push-packages-to-fedora.sh
index 779fab5..be61f5a 100755
--- a/rel-eng/push-packages-to-fedora.sh
+++ b/rel-eng/push-packages-to-fedora.sh
@@ -7,7 +7,7 @@ TOP_DIR_FEDORA=$1
 # top dir of spacewalk git checkout
 TOP_DIR_GIT=$2
 
-PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan
spacewalk-certs-tools rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC
perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID
perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend
spacewalk-certs-tools rhn-custom-info spacewalk-config"
+PACKAGE_LIST="rhnlib rhn-client-tools rhnsd yum-rhn-plugin rhncfg spacewalk-koan
spacewalk-certs-tools rhnpush nocpulse-common perl-Satcon perl-NOCpulse-CLAC
perl-NOCpulse-Debug perl-NOCpulse-Gritch perl-NOCpulse-Object perl-NOCpulse-SetID
perl-NOCpulse-Utils spacewalk-proxy-html spacewalk-proxy-docs spacecmd spacewalk-backend
spacewalk-certs-tools rhn-custom-info spacewalk-config rhnmd spacewalk-branding
python-gzipstream"
 
 
 if [ -z "$TOP_DIR_FEDORA" -o ! -d "$TOP_DIR_FEDORA" ]; then