spacewalk-commits July 2010

spacewalk-commits@lists.fedorahosted.org

11 participants
474 discussions

Changes to 'refs/tags/spacewalk-java-1.1.41-1'
by Justin Sherrill 30 Jul '10

30 Jul '10

Tag 'spacewalk-java-1.1.41-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-07-30 21:38 +0000 Tagging package [spacewalk-java] version [1.1.41-1] in directory [java/]. Changes since spacewalk-java-1.1.40-1: Justin Sherrill (2): 619381 - fixing issue where reprovisioning a system would cause registration to fail in the %post section resulting in the system not being registered at all. Automatic commit of package [spacewalk-java] release [1.1.41-1]. --- java/conf/cobbler/snippets/post_reactivation_key | 6 ++++++ java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Justin Sherrill 30 Jul '10

30 Jul '10

java/spacewalk-java.spec | 7 ++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit 5a3847ddf84a560b63ee5fa66ad9b2a7f2d7ec28 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Fri Jul 30 17:38:35 2010 -0400 Automatic commit of package [spacewalk-java] release [1.1.41-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 899030f..991b94b 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -19,7 +19,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.1.40 +Version: 1.1.41 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -331,6 +331,11 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Jul 30 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.41-1 +- 619381 - fixing issue where reprovisioning a system would cause registration + to fail in the %post section resulting in the system not being registered at + all. (jsherril(a)redhat.com) + * Fri Jul 30 2010 Shannon Hughes <shughes(a)redhat.com> 1.1.40-1 - modify build requires java for epoc 1:1.6.0 diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 2831f54..a933e69 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.1.40-1 java/ +1.1.41-1 java/

1 0

java/conf
by Justin Sherrill 30 Jul '10

30 Jul '10

java/conf/cobbler/snippets/post_reactivation_key | 6 ++++++ 1 file changed, 6 insertions(+) New commits: commit 3b72ce18cb12ecf446a86cc82a7e0f3926adbb76 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Fri Jul 30 17:37:49 2010 -0400 619381 - fixing issue where reprovisioning a system would cause registration to fail in the %post section resulting in the system not being registered at all. The cause was that we were obtaining a re-activation key regardless of whether or not a reactivation key was already being used within the kickstart(Which would invalidate the one already present). The little bit of code that i added will go through all activation keys of the kickstart and if one is a reactivation key, will not try to obtain a new one. diff --git a/java/conf/cobbler/snippets/post_reactivation_key b/java/conf/cobbler/snippets/post_reactivation_key index df38e4a..9b7a972 100644 --- a/java/conf/cobbler/snippets/post_reactivation_key +++ b/java/conf/cobbler/snippets/post_reactivation_key @@ -1,8 +1,14 @@ %post --interpreter /usr/bin/python import xmlrpclib +import os import os.path system_id = "/root/systemid.old" try: + + new_keys = "$redhat_management_key" + for key in new_keys.split(','): + if key.startswith('re-'): + os.exit(0) if os.path.exists(system_id): client = xmlrpclib.Server("http://$http_server/rpc/api") key = client.system.obtain_reactivation_key(open(system_id).read())

1 0

Changes to 'refs/tags/spacewalk-java-1.1.40-1'
by Shannon Hughes 30 Jul '10

30 Jul '10

Tag 'spacewalk-java-1.1.40-1' created by Shannon Hughes <shughes(a)redhat.com> at 2010-07-30 19:16 +0000 Tagging package [spacewalk-java] version [1.1.40-1] in directory [java/]. Changes since spacewalk-java-1.1.39-1: Shannon Hughes (2): modifying to only build brew rhel5 for now Automatic commit of package [spacewalk-java] release [1.1.40-1]. --- java/spacewalk-java.spec | 7 +++++-- rel-eng/packages/spacewalk-java | 2 +- rel-eng/tito.props | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Shannon Hughes 30 Jul '10

30 Jul '10

java/spacewalk-java.spec | 7 +++++-- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 16158f9ff04d7159d9c64b9339d99ccdffc1893d Author: Shannon Hughes <shughes(a)redhat.com> Date: Fri Jul 30 15:16:59 2010 -0400 Automatic commit of package [spacewalk-java] release [1.1.40-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 63bb26a..899030f 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -19,7 +19,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.1.39 +Version: 1.1.40 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -68,7 +68,7 @@ Requires: jpackage-utils >= 0:1.5 Requires: cobbler >= 1.6.3 BuildRequires: ant BuildRequires: ant-apache-regexp -BuildRequires: java-devel >= 1.6.0 +BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant-contrib BuildRequires: ant-junit BuildRequires: ant-nodeps @@ -331,6 +331,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Jul 30 2010 Shannon Hughes <shughes(a)redhat.com> 1.1.40-1 +- modify build requires java for epoc 1:1.6.0 + * Fri Jul 30 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.39-1 - few more changes for asm vs objectweb-asm detection (jsherril(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index d8764ea..2831f54 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.1.39-1 java/ +1.1.40-1 java/

1 0

rel-eng/tito.props
by Shannon Hughes 30 Jul '10

30 Jul '10

rel-eng/tito.props | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 6ef220a2ee2fda47eb87274d5fe34832d9ddec96 Author: Shannon Hughes <shughes(a)redhat.com> Date: Fri Jul 30 14:54:18 2010 -0400 modifying to only build brew rhel5 for now diff --git a/rel-eng/tito.props b/rel-eng/tito.props index ff36e48..4640da3 100644 --- a/rel-eng/tito.props +++ b/rel-eng/tito.props @@ -16,6 +16,9 @@ blacklist=jabberd-selinux disttag = .fc13 blacklist=jabberd-selinux +[satellite-5.4-rhel-5-candidate] +blacklist = python-hwdata spacewalk-proxy-html spacecmd spacewalk spacewalk-repo + [cvs] cvsroot = :gserver:cvs.devel.redhat.com:/cvs/dist -branches = SATELLITE-5_4-RHEL-5 SATELLITE-5_4-RHEL-6 +branches = SATELLITE-5_4-RHEL-5

1 0

Changes to 'refs/tags/spacewalk-java-1.1.39-1'
by Justin Sherrill 30 Jul '10

30 Jul '10

Tag 'spacewalk-java-1.1.39-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-07-30 18:44 +0000 Tagging package [spacewalk-java] version [1.1.39-1] in directory [java/]. Changes since spacewalk-java-1.1.38-1: Justin Sherrill (3): adding missing directory for java spec file adding missing rpm build root Automatic commit of package [spacewalk-java] release [1.1.39-1]. --- java/spacewalk-java.spec | 11 +++++++---- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Justin Sherrill 30 Jul '10

30 Jul '10

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 437899f49bb0319dc5123f8bff5b643bd89db49f Author: Justin Sherrill <jsherril(a)redhat.com> Date: Fri Jul 30 14:44:27 2010 -0400 Automatic commit of package [spacewalk-java] release [1.1.39-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index bf0b559..63bb26a 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -19,7 +19,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.1.38 +Version: 1.1.39 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -331,6 +331,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Jul 30 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.39-1 +- few more changes for asm vs objectweb-asm detection (jsherril(a)redhat.com) + * Fri Jul 30 2010 Justin Sherrill <jsherril(a)redhat.com> 1.1.38-1 - taking a stab at alternating between asm.jar and objectweb-asm/asm.jar to handle errors with taskomatic on fedora13 (jsherril(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index af81c16..d8764ea 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.1.38-1 java/ +1.1.39-1 java/

1 0

java/spacewalk-java.spec
by Justin Sherrill 30 Jul '10

30 Jul '10

java/spacewalk-java.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ed20993ca924f498cc4b5cc9041cd600b6ff15db Author: Justin Sherrill <jsherril(a)redhat.com> Date: Fri Jul 30 14:41:59 2010 -0400 adding missing rpm build root diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 6408151..bf0b559 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -258,9 +258,9 @@ touch $RPM_BUILD_ROOT/%{_var}/spacewalk/systemlogs/audit-review.log %if 0%{?rhel} && 0%{?rhel} < 6 -ln -s -f %{_javadir}/asm/asm.jar %{_datadir}/rhn/lib/spacewalk-asm.jar +ln -s -f %{_javadir}/asm/asm.jar $RPM_BUILD_ROOT/%{_datadir}/rhn/lib/spacewalk-asm.jar %else -ln -s -f %{_javadir}/objectweb-asm/asm.jar %{_datadir}/rhn/lib/spacewalk-asm.jar +ln -s -f %{_javadir}/objectweb-asm/asm.jar $RPM_BUILD_ROOT/%{_datadir}/rhn/lib/spacewalk-asm.jar %endif

1 0

java/spacewalk-java.spec
by Justin Sherrill 30 Jul '10

30 Jul '10

java/spacewalk-java.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 45dc5426beaab3db2e47aca734cbd68f32e51a79 Author: Justin Sherrill <jsherril(a)redhat.com> Date: Fri Jul 30 14:38:23 2010 -0400 adding missing directory for java spec file diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index bcbc367..6408151 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -258,9 +258,9 @@ touch $RPM_BUILD_ROOT/%{_var}/spacewalk/systemlogs/audit-review.log %if 0%{?rhel} && 0%{?rhel} < 6 -ln -s -f %{_javadir}/asm/asm.jar %{_datadir}/lib/spacewalk-asm.jar +ln -s -f %{_javadir}/asm/asm.jar %{_datadir}/rhn/lib/spacewalk-asm.jar %else -ln -s -f %{_javadir}/objectweb-asm/asm.jar %{_datadir}/lib/spacewalk-asm.jar +ln -s -f %{_javadir}/objectweb-asm/asm.jar %{_datadir}/rhn/lib/spacewalk-asm.jar %endif @@ -305,7 +305,7 @@ fi %files -n spacewalk-taskomatic %attr(755, root, root) %{_initrddir}/taskomatic %attr(755, root, root) %{_bindir}/taskomaticd -%attr(755, root, root) %{_datadir}/lib/spacewalk-asm.jar +%attr(755, root, root) %{_datadir}/rhn/lib/spacewalk-asm.jar %files config

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits July 2010