- up to 7.0.40; jcl 1.1.3; still build problem

diff --git a/jcl-build.xml.patch b/jcl-build.xml.patch
index 8470e5c308ffab5a28c55a218b0e457da413eea1..b40818682212239de0172946c76be0101e6e7afa 100644 (file)
--- 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 @@

diff --git a/tomcat.spec b/tomcat.spec
index c03be4cc1fd9e3a692b33a0a4443ae873f43693a..1de5f1eb1dc8c63f9f41bdf851b0a61a488d2e65 100644 (file)
--- 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