java/buildconf/build-props-tomcat6.xml | 1 +
java/spacewalk-java.spec | 18 ++++++++++++++----
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 16 insertions(+), 5 deletions(-)
New commits:
commit f4cb893164a77c8178a44234e19ed34368d85f99
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 13 15:01:39 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.108-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 92c52be..f5aae5b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.107
+Version: 1.8.108
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,18 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jul 13 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.108-1
+- struts jars may be available in different directories
+- Show XCCDF-diff icon on the XCCDF-Details page.
+- Show icon when referencing to XCCDF-diff
+- Show XCCDF-diff results on List-Scans page.
+- Rewrite ListScap page query with Dto & elaborator.
+- XCCDF Diff shall compare also scan's metadata.
+- Make sure that the user has permission to see the scan (when diffing).
+- Diff should show: either all, changed, or invariant items
+- OpenSCAP Integration -- XCCDF Scan Diff
+- checkstyle fix
+
* Thu Jul 12 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.107-1
- 829790 - fix PxtSessionDelegateImplTest test
- 829790 - fix PxtCookieManagerTest test
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a843e33..5df0ca2 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.107-1 java/
+1.8.108-1 java/
commit 1f762b09109590617ce96fc91f6c528c2378b702
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 13 13:42:49 2012 +0200
struts jars may be available in different directories
diff --git a/java/buildconf/build-props-tomcat6.xml
b/java/buildconf/build-props-tomcat6.xml
index 94e4f12..05ca9cf 100644
--- a/java/buildconf/build-props-tomcat6.xml
+++ b/java/buildconf/build-props-tomcat6.xml
@@ -2,5 +2,6 @@
<property name="tomcat-jars" value="tomcat6 tomcat6-jsp-2.1-api
tomcat6-servlet-2.5-api tomcat6-el-2.1-api" />
<property name="jasper-jars" value="tomcat6/jasper
tomcat6/jasper-el tomcat6/jasper-jdt" />
<property name="struts-jars" value="struts struts-extras
struts-taglib" />
+ <available file="/usr/share/java/struts/taglib.jar"
type="file" property="struts-jars" value="struts/core
struts/extras struts/taglib" />
<property name="other-jars" value="commons-chain" />
</project>
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0529357..92c52be 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -567,9 +567,7 @@ fi
%if 0%{?rhel} && 0%{?rhel} < 6
%{jardir}/struts.jar
%else
-%{jardir}/struts.jar
-%{jardir}/struts-taglib.jar
-%{jardir}/struts-extras.jar
+%{jardir}/struts*.jar
%{jardir}/commons-chain.jar
%endif