java/spacewalk-java.spec rel-eng/packages
by Šimon Lukašík
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit dc3afca0f4ab79df21e4c242446d8934147035d4
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Oct 24 10:32:24 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.64-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0b15bd9..a0ef9af 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.63
+Version: 1.6.64
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -557,6 +557,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Oct 24 2011 Simon Lukasik <slukasik(a)redhat.com> 1.6.64-1
+- No need to have separate configuration per Tomcat's version
+ (slukasik(a)redhat.com)
+- 748341 - No need to specify docBase, when it's the same as appBase
+ (slukasik(a)redhat.com)
+
* Fri Oct 21 2011 Miroslav Suchý 1.6.63-1
- 627809 - write out storage devices if *storage* device list is not empty
- 627809 - send xen virtual block devices to rhnParent
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 0ef2228..fa499c0 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.6.63-1 java/
+1.6.64-1 java/
12 years, 7 months
2 commits - java/conf java/spacewalk-java.spec
by Šimon Lukašík
java/conf/rhn.xml | 3 +--
java/conf/rhn6.xml | 22 ----------------------
java/spacewalk-java.spec | 2 +-
3 files changed, 2 insertions(+), 25 deletions(-)
New commits:
commit a7b8c4c49ee485b415aa06c2bc5a06f61e2be288
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Oct 24 10:24:50 2011 +0200
No need to have separate configuration per Tomcat's version
This basically reverts 7c61f92243852d8a52abdf6f894204155aff20e0.
diff --git a/java/conf/rhn6.xml b/java/conf/rhn6.xml
deleted file mode 100644
index 8c88a59..0000000
--- a/java/conf/rhn6.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
- This is a Tomcat 5 Context file. For more information see:
- http://jakarta.apache.org/tomcat/tomcat-5.0-doc/config/context.html
-
- path - is the url path you specify after http://hostname:8080/. To
- take over the root, you leave it empty.
-
- docBase - should the fully qualified path where your
- rhnwebapp is located.
- i.e. /home/devel/username/rhn-java/rhnwebapp
-
- debug - higher number produces more output.
-
- reloadable - indicates to Tomcat that the webapp should be reloaded
- when a change occurs.
-
- allowLinking - true to allow Tomcat to follow symlinks.
--->
-
-<Context path="/rhn" debug="0" reloadable="false" allowLinking="true">
-</Context>
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 697b49c..0b15bd9 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -324,7 +324,7 @@ install -m 755 conf/rhn.xml $RPM_BUILD_ROOT%{_sysconfdir}/tomcat5/Catalina/local
%else
ant -Dprefix=$RPM_BUILD_ROOT install-tomcat6
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tomcat6/Catalina/localhost/
-install -m 755 conf/rhn6.xml $RPM_BUILD_ROOT%{_sysconfdir}/tomcat6/Catalina/localhost/rhn.xml
+install -m 755 conf/rhn.xml $RPM_BUILD_ROOT%{_sysconfdir}/tomcat6/Catalina/localhost/rhn.xml
%endif
# check spelling errors in all resources for English if aspell installed
commit c81087e771e60bae00b7c74298a1f95b13207892
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Oct 24 10:18:51 2011 +0200
748341 - No need to specify docBase, when it's the same as appBase
Addressing:
WARNING: A docBase /var/lib/tomcat6/webapps/rhn inside the host appBase has been specified, and will be ignored
diff --git a/java/conf/rhn.xml b/java/conf/rhn.xml
index 3d717b88..8c88a59 100644
--- a/java/conf/rhn.xml
+++ b/java/conf/rhn.xml
@@ -17,6 +17,5 @@
allowLinking - true to allow Tomcat to follow symlinks.
-->
-<Context path="/rhn" docBase="/var/lib/tomcat5/webapps/rhn/"
- debug="0" reloadable="false" allowLinking="true">
+<Context path="/rhn" debug="0" reloadable="false" allowLinking="true">
</Context>
diff --git a/java/conf/rhn6.xml b/java/conf/rhn6.xml
index 7761aef..8c88a59 100644
--- a/java/conf/rhn6.xml
+++ b/java/conf/rhn6.xml
@@ -17,6 +17,5 @@
allowLinking - true to allow Tomcat to follow symlinks.
-->
-<Context path="/rhn" docBase="/var/lib/tomcat6/webapps/rhn/"
- debug="0" reloadable="false" allowLinking="true">
+<Context path="/rhn" debug="0" reloadable="false" allowLinking="true">
</Context>
12 years, 7 months
Changes to 'refs/tags/rhnlib-2.5.46-1'
by Martin Minar
Tag 'rhnlib-2.5.46-1' created by Martin Minar <mminar(a)redhat.com> at 2011-10-24 08:01 +0000
Tagging package [rhnlib] version [2.5.46-1] in directory [client/rhel/rhnlib/].
Changes since osad-5.10.24-1:
Martin Minar (1):
Automatic commit of package [rhnlib] release [2.5.46-1].
---
client/rhel/rhnlib/rhnlib.spec | 6 +++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 7 months
client/rhel rel-eng/packages
by Martin Minar
client/rhel/rhnlib/rhnlib.spec | 6 +++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 6c5520dbef32a876b3a418de354cf87710fef58b
Author: Martin Minar <mminar(a)redhat.com>
Date: Mon Oct 24 10:01:26 2011 +0200
Automatic commit of package [rhnlib] release [2.5.46-1].
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index e5fd774..327d119 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -4,7 +4,7 @@ Summary: Python libraries for the RHN project
Name: rhnlib
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.45
+Version: 2.5.46
Release: 1%{?dist}
Group: Development/Libraries
@@ -61,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Mon Oct 24 2011 Martin Minar <mminar(a)redhat.com> 2.5.46-1
+- simplify code (msuchy(a)redhat.com)
+- move imports to beginning of file (msuchy(a)redhat.com)
+
* Wed Aug 17 2011 Martin Minar <mminar(a)redhat.com> 2.5.45-1
- 730744 - support IPv6 connections (mzazrivec(a)redhat.com)
diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib
index a58a69c..a7aed51 100644
--- a/rel-eng/packages/rhnlib
+++ b/rel-eng/packages/rhnlib
@@ -1 +1 @@
-2.5.45-1 client/rhel/rhnlib/
+2.5.46-1 client/rhel/rhnlib/
12 years, 7 months
Changes to 'refs/tags/osad-5.10.24-1'
by Milan Zazrivec
Tag 'osad-5.10.24-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2011-10-21 15:23 +0000
Tagging package [osad] version [5.10.24-1] in directory [client/tools/osad/].
Changes since yum-rhn-plugin-1.6.14-1:
Milan Zazrivec (2):
679353 - automatically detect system re-registration
Automatic commit of package [osad] release [5.10.24-1].
---
client/tools/osad/osad.spec | 5 ++++-
client/tools/osad/src/osad.py | 2 +-
rel-eng/packages/osad | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
12 years, 7 months
client/tools rel-eng/packages
by Milan Zazrivec
client/tools/osad/osad.spec | 5 ++++-
rel-eng/packages/osad | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e9a53d650e769c1279f49d8057fd447e98a873e4
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Oct 21 17:23:31 2011 +0200
Automatic commit of package [osad] release [5.10.24-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 66bb930..9ad7da2 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,7 +16,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.23
+Version: 5.10.24
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -275,6 +275,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Fri Oct 21 2011 Milan Zazrivec <mzazrivec(a)redhat.com> 5.10.24-1
+- 679353 - automatically detect system re-registration
+
* Fri Sep 30 2011 Jan Pazdziora 5.10.23-1
- 689939 - match star in common name.
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index f781633..ec50aaa 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.23-1 client/tools/osad/
+5.10.24-1 client/tools/osad/
12 years, 7 months
client/tools
by Milan Zazrivec
client/tools/osad/src/osad.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit df8fd7dddba65f55305454d4b32a53ee2fe59813
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Oct 21 17:19:47 2011 +0200
679353 - automatically detect system re-registration
This fix is to avoid the need to re-start osad service after
the machine has been re-registered w/ Spacewalk.
By setting the select() timeout (currently to 180 seconds), we
will allow osad to re-enter the process_once() routine, which
takes care of the re-registration detection. Otherwise the system
could have been stuck in an infinite select().
diff --git a/client/tools/osad/src/osad.py b/client/tools/osad/src/osad.py
index 662e641..f0b2351 100644
--- a/client/tools/osad/src/osad.py
+++ b/client/tools/osad/src/osad.py
@@ -239,7 +239,7 @@ class Runner(jabber_lib.Runner):
config = self.read_config()
raise jabber_lib.NeedRestart
- client.process(timeout=None)
+ client.process(timeout=180)
def read_config(self):
ret = {}
12 years, 7 months
Changes to 'refs/tags/yum-rhn-plugin-1.6.14-1'
by Jan Pazdziora
Tag 'yum-rhn-plugin-1.6.14-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-10-21 14:11 +0000
Tagging package [yum-rhn-plugin] version [1.6.14-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since rhn-client-tools-1.6.27-1:
Jan Pazdziora (1):
Automatic commit of package [yum-rhn-plugin] release [1.6.14-1].
---
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 7 months
client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 36132d7e1b9167cf5c3926c942e4e394cf5fc8e0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 21 16:11:29 2011 +0200
Automatic commit of package [yum-rhn-plugin] release [1.6.14-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index dabd6a7..1d92342 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 1.6.13
+Version: 1.6.14
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -72,6 +72,10 @@ fi
%doc LICENSE
%changelog
+* Fri Oct 21 2011 Jan Pazdziora 1.6.14-1
+- When only package name is specified (like in Activation Key -> Packages),
+ only search installed by package name.
+
* Tue Oct 18 2011 Miroslav Suchý 1.6.13-1
- move errata.py action to the yum-rhn-plugin package (iartarisi(a)suse.cz)
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index b7af1a5..ab085c9 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.6.13-1 client/rhel/yum-rhn-plugin/
+1.6.14-1 client/rhel/yum-rhn-plugin/
12 years, 7 months
Changes to 'refs/tags/rhn-client-tools-1.6.27-1'
by Jan Pazdziora
Tag 'rhn-client-tools-1.6.27-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-10-21 14:11 +0000
Tagging package [rhn-client-tools] version [1.6.27-1] in directory [client/rhel/rhn-client-tools/].
Changes since rhn-client-tools-1.6.26-1:
Jan Pazdziora (3):
Pass the verbose option (-vv) from rhnreg_ks to rhn_check as well.
When only package name is specified (like in Activation Key -> Packages), only search installed by package name.
Automatic commit of package [rhn-client-tools] release [1.6.27-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py | 9 ++++++---
client/rhel/yum-rhn-plugin/actions/packages.py | 10 ++++++++++
rel-eng/packages/rhn-client-tools | 2 +-
4 files changed, 21 insertions(+), 5 deletions(-)
---
12 years, 7 months