rpms/tomcat
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f18' of ssh://pkgs.fedoraproject.org/tomcat into f19

Browse Source 
Conflicts:
	tomcat.spec
This commit is contained in:
Ivan Afonichev 2013-05-11 19:51:28 +04:00
commit b7e10ec545
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1 +1 @@
6ab7fcd20def4835f33d6c0b2f19c5ef apache-tomcat-7.0.37-src.tar.gz 158df72e6c046fa5d46a691a7c0805e6 apache-tomcat-7.0.40-src.tar.gz

10
tomcat.spec
View File

@ -31,7 +31,7 @@
%global jspspec 2.2 %global jspspec 2.2
%global major_version 7 %global major_version 7
%global minor_version 0 %global minor_version 0
%global micro_version 37 %global micro_version 40
%global packdname apache-tomcat-%{version}-src %global packdname apache-tomcat-%{version}-src
%global servletspec 3.0 %global servletspec 3.0
%global elspec 2.2 %global elspec 2.2
@ -409,6 +409,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
%{__ln_s} ../%{name}-el-%{elspec}-api.jar . %{__ln_s} ../%{name}-el-%{elspec}-api.jar .
%{__ln_s} $(build-classpath apache-commons-collections) commons-collections.jar %{__ln_s} $(build-classpath apache-commons-collections) commons-collections.jar
%{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar %{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar
%{__ln_s} $(build-classpath apache-commons-pool) commons-pool.jar
%{__ln_s} $(build-classpath log4j) log4j.jar %{__ln_s} $(build-classpath log4j) log4j.jar
%{__ln_s} $(build-classpath ecj) jasper-jdt.jar %{__ln_s} $(build-classpath ecj) jasper-jdt.jar
@ -676,6 +677,13 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog %changelog
* Sat May 11 2013 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.40-1
- Updated to 7.0.40
- Resolves: rhbz 956569 added missing commons-pool link
* Wed Feb 20 2013 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.39-1
- Updated to 7.0.39
* Mon Mar 4 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:7.0.37-2 * Mon Mar 4 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:7.0.37-2
- Add depmaps for org.eclipse.jetty.orbit - Add depmaps for org.eclipse.jetty.orbit
- Resolves: rhbz#917626 - Resolves: rhbz#917626