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)
Show replies by date