From 850f211a6449b2a5b331ecb93c936b9930c4af6e Mon Sep 17 00:00:00 2001 From: mef Date: Fri, 26 Mar 2010 17:12:38 +0000 Subject: [PATCH] Linking tomcat-juli instead of copying --- tomcat6.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tomcat6.spec b/tomcat6.spec index 5289d57..1f76dda 100644 --- a/tomcat6.spec +++ b/tomcat6.spec @@ -260,8 +260,6 @@ pushd %{packdname}/output/build %{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir} %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} %{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir} - # Put the juli jar under /usr/share/java/ too - %{__cp} -a bin/tomcat-juli*.jar ${RPM_BUILD_ROOT}%{libdir} %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} popd # javadoc @@ -337,6 +335,11 @@ pushd ${RPM_BUILD_ROOT}%{appdir}/sample 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 + # Install the maven metadata %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir} pushd %{packdname}/output/dist/src/res/maven @@ -505,7 +508,7 @@ fi %changelog * Fri Mar 26 2010 Mary Ellen Foster 0:6.0.24-2 - Add maven POMs and metadata -- Copy tomcat6-juli into /usr/share/java/tomcat6 +- Link tomcat6-juli into /usr/share/java/tomcat6 * Mon Mar 1 2010 Alexander Kurtakov 0:6.0.24-1 - Update to 6.0.24.