Changes to 'refs/tags/spacewalk-java-1.1.38-1'
by Justin Sherrill
Tag 'spacewalk-java-1.1.38-1' created by Justin Sherrill <jsherril(a)redhat.com> at 2010-07-30 18:16 +0000
Tagging package [spacewalk-java] version [1.1.38-1] in directory [java/].
Changes since spacewalk-search-1.1.5-1:
Jan Pazdziora (1):
Do not depend on cpp when sed works just as well.
Justin Sherrill (2):
taking a stab at alternating between asm.jar and objectweb-asm/asm.jar to handle errors with taskomatic on fedora13
Automatic commit of package [spacewalk-java] release [1.1.38-1].
---
java/conf/default/rhn_taskomatic_daemon.conf | 2 +-
java/spacewalk-java.spec | 16 +++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
schema/spacewalk/Makefile.schema | 8 +-------
schema/spacewalk/oracle/data/rhnVersionInfo.pre | 2 +-
schema/spacewalk/postgres/data/rhnVersionInfo.pre | 2 +-
6 files changed, 20 insertions(+), 12 deletions(-)
---
11 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Justin Sherrill
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 92ee8ef32882badc3346d7f3330528ec1001424e
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Jul 30 14:16:35 2010 -0400
Automatic commit of package [spacewalk-java] release [1.1.38-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index faf844e..bcbc367 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.37
+Version: 1.1.38
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -331,6 +331,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* 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)
+
* Thu Jul 29 2010 Partha Aji <paji(a)redhat.com> 1.1.37-1
- Config Management schema update + ui + symlinks (paji(a)redhat.com)
- 603133 - fixing issue where system within a group that were unentitled would
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index adcaa36..af81c16 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.1.37-1 java/
+1.1.38-1 java/
11 years, 11 months
java/conf java/spacewalk-java.spec
by Justin Sherrill
java/conf/default/rhn_taskomatic_daemon.conf | 2 +-
java/spacewalk-java.spec | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit bb821ca9a5619c776a708175ff38be782273691d
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Jul 30 14:15:38 2010 -0400
taking a stab at alternating between asm.jar and objectweb-asm/asm.jar to handle errors with taskomatic on fedora13
diff --git a/java/conf/default/rhn_taskomatic_daemon.conf b/java/conf/default/rhn_taskomatic_daemon.conf
index 737e22e..3397127 100644
--- a/java/conf/default/rhn_taskomatic_daemon.conf
+++ b/java/conf/default/rhn_taskomatic_daemon.conf
@@ -34,7 +34,7 @@ wrapper.java.classpath.10=/usr/share/java/commons-beanutils.jar
wrapper.java.classpath.11=/usr/share/java/ojdbc14.jar
wrapper.java.classpath.12=/usr/share/java/jta.jar
wrapper.java.classpath.13=/usr/share/java/concurrent.jar
-wrapper.java.classpath.14=/usr/share/java/asm/asm.jar
+wrapper.java.classpath.14=/usr/share/rhn/lib/spacewalk-asm.jar
wrapper.java.classpath.15=/usr/share/java/axis/jaxrpc.jar
wrapper.java.classpath.16=/usr/share/java/commons-collections.jar
wrapper.java.classpath.17=/usr/share/java/taglibs-standard.jar
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b2964a8..faf844e 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -257,6 +257,14 @@ ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk
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
+%else
+ln -s -f %{_javadir}/objectweb-asm/asm.jar %{_datadir}/lib/spacewalk-asm.jar
+%endif
+
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -297,6 +305,8 @@ 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
+
%files config
%defattr(644, root, root)
11 years, 11 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/Makefile.schema | 8 +-------
schema/spacewalk/oracle/data/rhnVersionInfo.pre | 2 +-
schema/spacewalk/postgres/data/rhnVersionInfo.pre | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 5386d9272cb0a16167a0daaeca1cc7b74312bede
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 30 16:25:59 2010 +0200
Do not depend on cpp when sed works just as well.
diff --git a/schema/spacewalk/Makefile.schema b/schema/spacewalk/Makefile.schema
index 76cb11f..512e632 100644
--- a/schema/spacewalk/Makefile.schema
+++ b/schema/spacewalk/Makefile.schema
@@ -18,13 +18,7 @@ clean :
echo rm -f $(POST_FILES)
%.sql : %.pre
- @{ \
- cpp -D SCHEMA_NAME=\'$(SCHEMA)\' \
- -D SCHEMA_VERSION=\'$(VERSION)\' \
- -D SCHEMA_RELEASE=\'$(RELEASE)\' \
- -P -o - $< ; \
- echo ; \
- } > $@
+ sed -e "s!SCHEMA_NAME!'$(SCHEMA)'!g" -e "s!SCHEMA_VERSION!'$(VERSION)'!g" -e "s!SCHEMA_RELEASE!'$(RELEASE)'!" $< > $@
sanity-check :
perl schema-source-sanity-check.pl
diff --git a/schema/spacewalk/oracle/data/rhnVersionInfo.pre b/schema/spacewalk/oracle/data/rhnVersionInfo.pre
index d9cd447..6eeca80 100644
--- a/schema/spacewalk/oracle/data/rhnVersionInfo.pre
+++ b/schema/spacewalk/oracle/data/rhnVersionInfo.pre
@@ -1,5 +1,5 @@
--
--- this populates rhnVersionInfo. It needs to be run through cpp
+-- this populates rhnVersionInfo. It needs to be run through sed
-- during build. see Makefile.schema
--
diff --git a/schema/spacewalk/postgres/data/rhnVersionInfo.pre b/schema/spacewalk/postgres/data/rhnVersionInfo.pre
index d9cd447..6eeca80 100644
--- a/schema/spacewalk/postgres/data/rhnVersionInfo.pre
+++ b/schema/spacewalk/postgres/data/rhnVersionInfo.pre
@@ -1,5 +1,5 @@
--
--- this populates rhnVersionInfo. It needs to be run through cpp
+-- this populates rhnVersionInfo. It needs to be run through sed
-- during build. see Makefile.schema
--
11 years, 11 months
Changes to 'refs/tags/spacewalk-search-1.1.5-1'
by Tomas Lestach
Tag 'spacewalk-search-1.1.5-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-07-30 12:57 +0000
Tagging package [spacewalk-search] version [1.1.5-1] in directory [search-server/spacewalk-search/].
Changes since spacewalk-backend-1.1.44-1:
Jan Pazdziora (3):
Empty line in the create table command causes error during raw db population.
Underscore is not valid syntax during raw db population.
The slash is not needed as it causes the create index command to be run for the second time, during raw db population.
Tomas Lestach (2):
adding slf4j jar runtime dependencies
Automatic commit of package [spacewalk-search] release [1.1.5-1].
---
rel-eng/packages/spacewalk-search | 2 +-
schema/spacewalk/common/tables/rhnContentSource.sql | 4 +---
schema/spacewalk/common/tables/rhnKSData.sql | 3 +--
schema/spacewalk/common/tables/rhn_current_state_summaries.sql | 4 ++--
search-server/spacewalk-search/spacewalk-search.spec | 7 ++++++-
search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 3 +++
6 files changed, 14 insertions(+), 9 deletions(-)
---
11 years, 11 months
rel-eng/packages search-server/spacewalk-search
by Tomas Lestach
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 8a4007d342781dc7256b951737a0bb8e43fdcda2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 30 14:57:41 2010 +0200
Automatic commit of package [spacewalk-search] release [1.1.5-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index 0adb029..56d46f8 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-1.1.4-1 search-server/spacewalk-search/
+1.1.5-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index 8f9708b..4ccabb2 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 1.1.4
+Version: 1.1.5
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -114,6 +114,11 @@ fi
%{_sysconfdir}/logrotate.d/rhn-search
%changelog
+* Fri Jul 30 2010 Tomas Lestach <tlestach(a)redhat.com> 1.1.5-1
+- adding slf4j jar runtime dependencies (tlestach(a)redhat.com)
+- correct the path to oci (mzazrivec(a)redhat.com)
+- changes due to simple-core gets packaged separatelly (tlestach(a)redhat.com)
+
* Wed Jul 28 2010 Milan Zazrivec <mzazrivec(a)redhat.com> 1.1.4-1
- build ConnectionURL from db_* values in rhn.conf
- set java.library.path for search to be able to find oci library
11 years, 11 months
search-server/spacewalk-search
by Tomas Lestach
search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit d0534417707b8d17f38452e794421f555989abd9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 30 13:46:59 2010 +0200
adding slf4j jar runtime dependencies
diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
index 526e3f5..998412b 100644
--- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
+++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
@@ -38,6 +38,9 @@ wrapper.java.classpath.18=/usr/share/nutch/conf
wrapper.java.classpath.19=/usr/share/rhn/search/lib/nutch-2008-12-01_04-01-21.jar
wrapper.java.classpath.20=/usr/share/rhn/search/lib/commons-httpclient-3.0.jar
+wrapper.java.classpath.21=/usr/share/java/slf4j-api.jar
+wrapper.java.classpath.22=/usr/share/java/slf4j-jcl.jar
+
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=/usr/lib
wrapper.java.library.path.2=/usr/lib64
11 years, 11 months
3 commits - schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/tables/rhnContentSource.sql | 4 +---
schema/spacewalk/common/tables/rhnKSData.sql | 3 +--
schema/spacewalk/common/tables/rhn_current_state_summaries.sql | 4 ++--
3 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 1a50846a7a445bac96c2f232dbb08e03ce9cfdaf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 30 14:28:06 2010 +0200
The slash is not needed as it causes the create index command to be run for the second time, during raw db population.
diff --git a/schema/spacewalk/common/tables/rhnContentSource.sql b/schema/spacewalk/common/tables/rhnContentSource.sql
index 479bae8..347aa12 100644
--- a/schema/spacewalk/common/tables/rhnContentSource.sql
+++ b/schema/spacewalk/common/tables/rhnContentSource.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -44,9 +44,3 @@ create unique index rhn_cs_uq
tablespace [[64k_tbs]]
;
-/
-
---
--- Revision 1.0 2009/06/26 21:54 jlsherrill
--- Initial file.
---
commit 6f37477e41aca9e9ef04007a6f6df1168b10a4e9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 30 14:26:52 2010 +0200
Underscore is not valid syntax during raw db population.
diff --git a/schema/spacewalk/common/tables/rhn_current_state_summaries.sql b/schema/spacewalk/common/tables/rhn_current_state_summaries.sql
index 49aee46..84c7be4 100644
--- a/schema/spacewalk/common/tables/rhn_current_state_summaries.sql
+++ b/schema/spacewalk/common/tables/rhn_current_state_summaries.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -16,7 +16,7 @@
CREATE TABLE rhn_current_state_summaries
(
- customer_id NUMBER(12)_ NOT NULL,
+ customer_id NUMBER(12) NOT NULL,
template_id VARCHAR2(10) NOT NULL,
state VARCHAR2(20) NOT NULL,
state_count NUMBER(9),
commit 62b425aaef44c1f9ce037ae7478007a18e93a65a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 30 14:26:02 2010 +0200
Empty line in the create table command causes error during raw db population.
diff --git a/schema/spacewalk/common/tables/rhnKSData.sql b/schema/spacewalk/common/tables/rhnKSData.sql
index 176519f..576014b 100644
--- a/schema/spacewalk/common/tables/rhnKSData.sql
+++ b/schema/spacewalk/common/tables/rhnKSData.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2010 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
@@ -64,7 +64,6 @@ CREATE TABLE rhnKSData
DEFAULT (sysdate) NOT NULL,
modified DATE
DEFAULT (sysdate) NOT NULL,
-
CONSTRAINT rhn_ks_type_ck
CHECK (ks_type in ( 'wizard' , 'raw' ))
)
11 years, 11 months
Changes to 'refs/tags/spacewalk-backend-1.1.44-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.1.44-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-07-30 08:58 +0000
Tagging package [spacewalk-backend] version [1.1.44-1] in directory [backend/].
Changes since spacewalk-backend-1.1.43-1:
Jan Pazdziora (2):
It is dbname without underscore for PostgreSQL.
Automatic commit of package [spacewalk-backend] release [1.1.44-1].
Miroslav Suchý (1):
619699 - do not blow out if we get unicode string
---
backend/common/rhnConfig.py | 2 +-
backend/server/rhnSQL/driver_cx_Oracle.py | 2 +-
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
---
11 years, 11 months
backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 89f90cb235d2d73794f62608567eb2073ebfdea7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jul 30 10:58:06 2010 +0200
Automatic commit of package [spacewalk-backend] release [1.1.44-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index c2e9de7..5ace748 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.1.43
+Version: 1.1.44
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -682,6 +682,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Jul 30 2010 Jan Pazdziora 1.1.44-1
+- It is dbname without underscore for PostgreSQL.
+- 619699 - do not blow out if we get unicode string (msuchy(a)redhat.com)
+
* Thu Jul 29 2010 Partha Aji <paji(a)redhat.com> 1.1.43-1
- Config Management schema update + ui + symlinks (paji(a)redhat.com)
- send only actions which we are able to cache (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 167861c..43d24d7 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.1.43-1 backend/
+1.1.44-1 backend/
11 years, 11 months