revert part of r1625606 to be able to build commons logging extras

https://svn.apache.org/viewvc?view=revision&revision=1625606

diff --git a/jcl.patch b/jcl.patch
new file mode 100644 (file)
index 0000000..89c8709
--- /dev/null
+++ b/jcl.patch
@@ -0,0 +1,16 @@
+revert part of inheritAll=false
+https://bz.apache.org/bugzilla/show_bug.cgi?id=56988
+
+otherwise deps for jcl build don't get set
+
+--- tc7.0.x/build.xml~ 2015-07-26 22:42:44.873164872 +0300
++++ tc7.0.x/build.xml  2015-07-26 22:53:44.930780044 +0300
+@@ -1613,7 +1613,7 @@
+ 
+     <ant antfile="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build2.xml"
+          dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src"
+-         inheritAll="false" target="compile" />
++         inheritAll="true" target="compile" />
+ 
+     <jar jarfile="${tomcat-juli-extras.jar}"
+          manifest="${tomcat.manifests}/default.manifest"

diff --git a/tomcat.spec b/tomcat.spec
index bde36dd95cfe247806b2dc0671476333dffa45aa..4ca65b2e69ac9daf948017b0e75d8fca349ab613 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -39,6 +39,7 @@ Patch2:               %{name}-LDAPUserDatabase.patch
 Patch3:                %{name}-catalina.policy-javadir.patch
 Patch4:                %{name}-userdir.patch
 Patch5:                logging.patch
+Patch6:                jcl.patch
 Patch100:      jcl-build.xml.patch
 URL:           http://tomcat.apache.org/
 BuildRequires: ant >= 1.5.3
@@ -267,6 +268,7 @@ javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext).
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # Prepare java-commmons-logging sources
 install -d output/extras/logging