pool/tomcat
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- drop a dependency on unecessary -tomcat5 packages

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=34
This commit is contained in:
Michal Vyskocil 2013-09-05 14:01:11 +00:00 committed by Git OBS Bridge
parent 03dee901ab
commit 148ca89386
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tomcat.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 5 13:59:28 UTC 2013 - mvyskocil@suse.com
- drop a dependency on unecessary -tomcat5 packages
- use commons-dbcp.jar for build
- add missing commons-pool.jar to libdir
-------------------------------------------------------------------
Fri Aug 9 09:18:44 UTC 2013 - mvyskocil@suse.com

12
tomcat.spec
View File

@ -217,9 +217,9 @@ Requires: %{name}-el-%{elspec}-api = %{version}-%{release}
Requires: %{name}-jsp-%{jspspec}-api = %{version}-%{release}
Requires: %{name}-servlet-%{servletspec}-api = %{version}-%{release}
Requires(post): ecj >= 4.2.1
Requires(post): jakarta-commons-collections-tomcat5
Requires(post): jakarta-commons-dbcp-tomcat5
Requires(post): jakarta-commons-pool-tomcat5
#Requires(post): jakarta-commons-collections-tomcat5
#$Requires(post): jakarta-commons-dbcp-tomcat5
#Requires(post): jakarta-commons-pool-tomcat5
Requires(preun):%{__rm}
%description lib
@ -289,7 +289,7 @@ touch HACKDIR/build.xml
-Dcommons-daemon.native.src.tgz="HACK" \
-Djasper-jdt.jar="$(build-classpath ecj)" \
-Djdt.jar="$(build-classpath ecj)" \
-Dtomcat-dbcp.jar="HACK" \
-Dtomcat-dbcp.jar="$(build-classpath commons-dbcp)" \
-Dtomcat-native.tar.gz="HACK" \
-Dtomcat-native.home="." \
-Dcommons-daemon.native.win.mgr.exe="HACK" \
@ -305,7 +305,8 @@ touch HACKDIR/build.xml
# remove some jars that we'll replace with symlinks later
%{__rm} output/build/bin/commons-daemon.jar \
output/build/lib/ecj.jar
output/build/lib/ecj.jar \
output/build/lib/commons-dbcp.jar
# remove the cruft we created
%{__rm} output/build/bin/tomcat-native.tar.gz
@ -448,6 +449,7 @@ pushd %{buildroot}%{libdir}
%{__ln_s} ../%{name}-el-%{elspec}-api.jar .
%{__ln_s} $(build-classpath commons-collections) commons-collections.jar
%{__ln_s} $(build-classpath commons-dbcp) commons-dbcp.jar
%{__ln_s} $(build-classpath commons-pool) commons-pool.jar
%{__ln_s} $(build-classpath log4j) log4j.jar
%{__ln_s} $(build-classpath ecj) jasper-jdt.jar