[tomcat6/f14/master] resolves: rhbz 701037 - bad symlink for tomcat-juli.jar

[Dave Knox]

commit 99b543bbbfc038201c0cf470d3db9ab1e5a3443d
Author: David Knox <dknox at dknox.(none)>
Date:   Mon May 2 12:38:57 2011 -0600

    resolves: rhbz 701037 - bad symlink for tomcat-juli.jar

 tomcat6.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 2963588..92fc942 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -55,7 +55,7 @@
 Name: tomcat6
 Epoch: 0
 Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 20%{?dist}
+Release: 21%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -379,6 +379,8 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
     %{__ln_s} $(build-classpath jakarta-commons-dbcp) .
     %{__ln_s} $(build-classpath jakarta-commons-pool) .
     %{__ln_s} $(build-classpath ecj) jasper-jdt.jar
+# Link the juli jar into /usr/share/java/tomcat6
+	 %{__ln_s} %{bindir}/tomcat-juli.jar .
 popd
 pushd ${RPM_BUILD_ROOT}%{bindir}
    # fix up jars to include version number
@@ -406,9 +408,9 @@ popd
 %{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war
 
 # Link the juli jars into /usr/share/java/tomcat6
-pushd ${RPM_BUILD_ROOT}%{libdir}
-%{__ln_s} %{bindir}/tomcat-juli* .
-popd
+#pushd ${RPM_BUILD_ROOT}%{libdir}
+#%{__ln_s} %{bindir}/tomcat-juli* .
+#popd
 
 # Install the maven metadata
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
@@ -640,6 +642,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Mon May 01 2011 David Knox <dknox at redhat.com> O:6.0.26-21
+* Resolves rhbz 701037 - bad symbolic link to tomcat-juli
+
 * Thu Apr 14 2011 David Knox <dknox at redhat.com> 0:6.0.26-20
 * Applied CVE-2010-3718, CVE-2011-0013, CVE-2011-0534