java/spacewalk-java.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 1677d09cf8d5c8226f6884136a0dc36105cff75c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 26 18:56:40 2011 +0200
create special symlink for f15 tomcat-juli.jar
adressing spacewalk-java buildlog:
taskdef A class needed by class com.redhat.rhn.internal.jasper2.JspfC cannot be found:
org/apache/juli/logging/LogFactory
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b727fd4..d1798c5 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -272,10 +272,15 @@ This package contains the Java version of taskomatic.
%setup -q
# missing tomcat juli JAR (needed for JSP precompilation) - bug 661244
-if test -d /usr/share/tomcat6 -a ! -h /usr/share/java/tomcat6/tomcat-juli.jar; then
+if test -d /usr/share/tomcat6; then
mkdir -p build/build-lib
- ln -s /usr/share/tomcat6/bin/tomcat-juli.jar \
- build/build-lib/tomcat-juli.jar
+ if test ! -h /usr/share/java/tomcat6/tomcat-juli.jar; then
+ ln -s /usr/share/tomcat6/bin/tomcat-juli.jar \
+ build/build-lib/tomcat-juli.jar
+ else
+ ln -s /usr/share/java/tomcat6/tomcat-juli.jar \
+ build/build-lib/tomcat-juli.jar
+ fi
fi