java/buildconf/build-props.xml | 6 +
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 2
java/spacewalk-java.spec | 34
++++++----
rel-eng/packages/spacewalk-jpp-workaround | 2
spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec | 10 ++
5 files changed, 38 insertions(+), 16 deletions(-)
New commits:
commit e3e45e3eb357120dc8936f11046b79338fb79aa0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 10 13:09:49 2014 +0100
Automatic commit of package [spacewalk-jpp-workaround] release [1.0.5-1].
diff --git a/rel-eng/packages/spacewalk-jpp-workaround
b/rel-eng/packages/spacewalk-jpp-workaround
index b9f3e36..f1ad7ae 100644
--- a/rel-eng/packages/spacewalk-jpp-workaround
+++ b/rel-eng/packages/spacewalk-jpp-workaround
@@ -1 +1 @@
-1.0.4-1 spec-tree/spacewalk-jpp-workaround/
+1.0.5-1 spec-tree/spacewalk-jpp-workaround/
diff --git a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
index 02631a3..eadadaa 100644
--- a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
+++ b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
@@ -1,5 +1,5 @@
Name: spacewalk-jpp-workaround
-Version: 1.0.4
+Version: 1.0.5
Release: 1%{?dist}
Summary: Workaround package to fulfill jpackage broken dependencies
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jan 10 2014 Tomas Lestach <tlestach(a)redhat.com> 1.0.5-1
+- introduce commons-logging workaround for fc20
+
* Fri Jul 13 2012 Tomas Lestach <tlestach(a)redhat.com> 1.0.4-1
- let the workaround package require fedora struts to ensure the struts-*
provides
commit 6723195bd5ab38a6c1f1f0d7fa664b0385e589ee
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 9 14:41:06 2014 +0100
1013712 - return server action message within schedule.listInProgressSystems and
schedule.listCompletedSystems API calls
according to API doc
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 3d78fb8..e61a799 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1105,6 +1105,7 @@ ORDER BY SP.position
<query params="org_id, aid, user_id">
SELECT S.id,
S.name as SERVER_NAME,
+ SA.result_msg AS MESSAGE,
A.earliest_action AS DISPLAY_DATE
FROM rhnAction A,
rhnServer S,
@@ -1152,6 +1153,7 @@ ORDER BY UPPER(COALESCE(S.name, '(none)')), S.ID
<mode name="systems_completed_action"
class="com.redhat.rhn.frontend.dto.ActionedSystem">
<query params="org_id, aid, user_id">
SELECT S.id, S.name,
+ SA.result_msg AS MESSAGE,
SA.COMPLETION_TIME AS DISPLAY_DATE
FROM rhnServer S, rhnServerAction SA
WHERE S.org_id = :org_id
commit c3ef2b2d57fa5a295ea45abb2342075911bfc9a2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jan 10 13:05:29 2014 +0100
introduce commons-logging workaround for fc20
due to jpackage oscache requiring jakarta-commons-logging (what isn't compatible
with Spacewalk on fc20)
diff --git a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
index 1ef8133..02631a3 100644
--- a/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
+++ b/spec-tree/spacewalk-jpp-workaround/spacewalk-jpp-workaround.spec
@@ -35,6 +35,11 @@ Provides: struts-tiles = 1.3.10
Requires: struts >= 1.3.10
%endif
+%if 0%{?fedora} >= 20
+Provides: jakarta-commons-logging = 1.1.3
+Requires: apache-commons-logging
+%endif
+
%description
This package fulfills jpackage missing msv-msv dependency.
commit e5b54ce278e4856adb1c9082f6293c26acbed251
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 9 17:05:09 2014 +0100
fix linking of hibernate-commons-annotations
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index daabc74..a6b722c 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -56,9 +56,13 @@
<available file="/usr/share/java/jfreechart/jfreechart.jar" />
</condition>
+ <condition property="hibernate-commons-annotations"
value="hibernate/hibernate-commons-annotations"
else="hibernate-commons-annotations/hibernate-commons-annotations">
+ <available
file="/usr/share/java/hibernate/hibernate-commons-annotations.jar" />
+ </condition>
+
<property name="hibernate3.2deps" value="hibernate3"/>
- <property name="hibernate3.6deps"
value="hibernate3/hibernate-ehcache-3 hibernate3/hibernate-c3p0-3
hibernate3/hibernate-core-3 hibernate/hibernate-commons-annotations slf4j/api
jboss-logging javassist slf4j/log4j12 ehcache-core hibernate-jpa-2.0-api"/>
+ <property name="hibernate3.6deps"
value="hibernate3/hibernate-ehcache-3 hibernate3/hibernate-c3p0-3
hibernate3/hibernate-core-3 ${hibernate-commons-annotations} slf4j/api jboss-logging
javassist slf4j/log4j12 ehcache-core hibernate-jpa-2.0-api"/>
<condition property="hibernate"
value="${hibernate3.2deps}"
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 9d1977b..80daed9 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -660,7 +660,7 @@ fi
%{jardir}/hibernate3*
%if 0%{?fedora}
%{jardir}/ehcache-core.jar
-%{jardir}/hibernate_hibernate-commons-annotations.jar
+%{jardir}/*_hibernate-commons-annotations.jar
%{jardir}/hibernate-jpa-2.0-api.jar
%{jardir}/javassist.jar
%{jardir}/slf4j_api.jar
commit f67d186dc12c151da566f56e14c35220700a554c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 9 11:04:25 2014 +0100
ant-nodpes is buildrequired on rhels
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index e4fc718..9d1977b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -117,6 +117,7 @@ Requires: javapackages-tools
%else
BuildRequires: jakarta-commons-validator
BuildRequires: ant-contrib
+BuildRequires: ant-nodeps
BuildRequires: jpackage-utils
Requires: jpackage-utils
%endif
@@ -135,9 +136,6 @@ BuildRequires: ant
BuildRequires: ant-apache-regexp
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant-junit
-%if 0%{?fedora} && 0%{?fedora} < 20
-BuildRequires: ant-nodeps
-%endif
BuildRequires: antlr >= 0:2.7.6
BuildRequires: jpam
BuildRequires: tanukiwrapper
commit a684d41b52145e2e1656b737dbf1601c2311cf99
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 8 17:24:19 2014 +0100
differentiate between apache- and jakarta- buildrequires on fedora and rhel
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0863f30..e4fc718 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -110,10 +110,12 @@ Requires: spacewalk-java-lib
Requires: spacewalk-java-jdbc
Requires: spacewalk-branding
%if 0%{?fedora} >= 20
+BuildRequires: apache-commons-validator
BuildRequires: mvn(ant-contrib:ant-contrib)
BuildRequires: javapackages-tools
Requires: javapackages-tools
%else
+BuildRequires: jakarta-commons-validator
BuildRequires: ant-contrib
BuildRequires: jpackage-utils
Requires: jpackage-utils
@@ -121,11 +123,13 @@ Requires: jpackage-utils
Requires: cobbler >= 2.0.0
Requires: dojo
%if 0%{?fedora}
-Requires: apache-commons-io
-Requires: apache-commons-logging
+Requires: apache-commons-io
+BuildRequires: apache-commons-logging
+Requires: apache-commons-logging
%else
-Requires: jakarta-commons-io
-Requires: jakarta-commons-logging
+Requires: jakarta-commons-io
+BuildRequires: jakarta-commons-logging
+Requires: jakarta-commons-logging
%endif
BuildRequires: ant
BuildRequires: ant-apache-regexp
@@ -165,13 +169,11 @@ BuildRequires: javassist
BuildRequires: hibernate3 = 0:3.2.4
%endif
BuildRequires: jaf
-BuildRequires: jakarta-commons-cli
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-collections
BuildRequires: jakarta-commons-discovery
BuildRequires: jakarta-commons-el
BuildRequires: jakarta-commons-fileupload
-BuildRequires: jakarta-commons-validator
BuildRequires: jakarta-taglibs-standard
BuildRequires: jcommon
BuildRequires: jdom
@@ -207,8 +209,10 @@ BuildRequires: postgresql-jdbc
%if 0%{?fedora}
# spelling checker is only for Fedoras (no aspell in RHEL6)
BuildRequires: aspell aspell-en libxslt
+BuildRequires: apache-commons-cli
BuildRequires: apache-commons-io
%else
+BuildRequires: jakarta-commons-cli
BuildRequires: jakarta-commons-io
%endif
Obsoletes: rhn-java < 5.3.0
commit 316e4bcd44acb6c08e9b8ab0c7348b81c64754c0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jan 9 09:01:13 2014 +0100
buildrequire mvn(ant-contrib:ant-contrib) on fc20
to use the fedora ant-contrib package and not the one from jpackage
(jpackage version requires jakarta-commons-logging, what conflicts with
apache-commons-logging)
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f47f7ef..0863f30 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -110,9 +110,11 @@ Requires: spacewalk-java-lib
Requires: spacewalk-java-jdbc
Requires: spacewalk-branding
%if 0%{?fedora} >= 20
+BuildRequires: mvn(ant-contrib:ant-contrib)
BuildRequires: javapackages-tools
Requires: javapackages-tools
%else
+BuildRequires: ant-contrib
BuildRequires: jpackage-utils
Requires: jpackage-utils
%endif
@@ -128,7 +130,6 @@ Requires: jakarta-commons-logging
BuildRequires: ant
BuildRequires: ant-apache-regexp
BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: ant-contrib
BuildRequires: ant-junit
%if 0%{?fedora} && 0%{?fedora} < 20
BuildRequires: ant-nodeps
commit 95bcca88c9aab57d62210759f2de742185078292
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 8 17:05:16 2014 +0100
build/require javapackages-tools on fc20
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b14364f..f47f7ef 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -109,7 +109,13 @@ Requires: spacewalk-java-config
Requires: spacewalk-java-lib
Requires: spacewalk-java-jdbc
Requires: spacewalk-branding
-Requires: jpackage-utils >= 0:1.5
+%if 0%{?fedora} >= 20
+BuildRequires: javapackages-tools
+Requires: javapackages-tools
+%else
+BuildRequires: jpackage-utils
+Requires: jpackage-utils
+%endif
Requires: cobbler >= 2.0.0
Requires: dojo
%if 0%{?fedora}
@@ -188,7 +194,6 @@ BuildRequires: struts >= 0:1.3.0
BuildRequires: struts-taglib >= 0:1.3.0
BuildRequires: tomcat >= 7
BuildRequires: tomcat-lib >= 7
-BuildRequires: jpackage-utils
%else
BuildRequires: struts >= 0:1.3.0
BuildRequires: struts-taglib >= 0:1.3.0