commit 48c2d77146deb531953604bae1349456360c8bcd Author: Arkadiusz Miśkiewicz <ar...@maven.pl> Date: Thu Jun 6 12:31:55 2013 +0200
- up to 7.0.40; jcl 1.1.3; still build problem jcl-build.xml.patch | 9 --------- tomcat.spec | 8 ++++---- 2 files changed, 4 insertions(+), 13 deletions(-) --- diff --git a/tomcat.spec b/tomcat.spec index c03be4c..1de5f1e 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -6,18 +6,18 @@ %define servletapiver 3.0 # Java Commons Logging version. Must be >= 1.1. -%define jclver 1.1.1 +%define jclver 1.1.3 %include /usr/lib/rpm/macros.java Summary: Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP %{jspapiver} API Summary(pl.UTF-8): Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver} Name: tomcat -Version: 7.0.35 +Version: 7.0.40 Release: 1 License: Apache v2.0 Group: Networking/Daemons/Java Source0: http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz -# Source0-md5: ccc93c9eff76c16f9133148e171c94e3 +# Source0-md5: 158df72e6c046fa5d46a691a7c0805e6 Source1: apache-%{name}.init Source2: apache-%{name}.sysconfig Source3: %{name}-build.properties @@ -27,7 +27,7 @@ Source12: %{name}-context-manager.xml Source13: %{name}-context-host-manager.xml Source14: %{name}-context-examples.xml Source100: http://www.apache.org/dist/commons/logging/source/commons-logging-%{jclver}-src.tar.gz -# Source100-md5: e5cfa8cca13152d7545fde6b1783c60a +# Source100-md5: e8e197d628436490886d17cffa108fe3 Patch0: %{name}-build.xml.patch Patch1: server.xml-URIEncoding-utf8.patch Patch2: %{name}-LDAPUserDatabase.patch diff --git a/jcl-build.xml.patch b/jcl-build.xml.patch index 8470e5c..b408186 100644 --- a/jcl-build.xml.patch +++ b/jcl-build.xml.patch @@ -1,14 +1,5 @@ --- commons-logging-1.1.1-src/build.xml~ 2010-06-09 20:47:36.000000000 +0200 +++ commons-logging-1.1.1-src/build.xml 2010-06-09 20:48:11.000000000 +0200 -@@ -94,7 +94,7 @@ - <property name="component.title" value="Logging Wrapper Library"/> - - <!-- The current version number of this component --> -- <property name="component.version" value="1.1.1-SNAPSHOT"/> -+ <property name="component.version" value="1.1.1"/> - - <!-- The base directory for compilation targets --> - <property name="build.home" value="${basedir}/target"/> --- commons-logging-1.1.1-src/build.xml~ 2007-11-22 00:27:52.000000000 +0100 +++ commons-logging-1.1.1-src/build.xml 2010-06-09 20:27:15.000000000 +0200 @@ -146,7 +146,8 @@ ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/tomcat.git/commitdiff/48c2d77146deb531953604bae1349456360c8bcd _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit