Merge branch 'dev-7.0.55'

Conflicts:
	tomcat.spec

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/server.xml-URIEncoding-utf8.patch b/server.xml-URIEncoding-utf8.patch
index 7eeda6172fcd5d26ce7b4bf2fc2b0085409607ba..7c22914a1cb6782b18918ea7fa4d0017c810ada6 100644 (file)
--- a/server.xml-URIEncoding-utf8.patch
+++ b/server.xml-URIEncoding-utf8.patch
@@ -1,5 +1,5 @@
---- apache-tomcat-7.0.26-src/conf/server.xml   2012-02-17 15:15:30.000000000 +0100
-+++ apache-tomcat-7.0.26-src.new/conf/server.xml       2012-03-19 10:08:10.806085375 +0100
+--- apache-tomcat-7.0.55-src/conf/server.xml~  2014-09-19 16:23:41.000000000 +0300
++++ apache-tomcat-7.0.55-src/conf/server.xml   2014-09-19 16:24:20.849354198 +0300
 @@ -68,13 +68,15 @@
           Define a non-SSL HTTP/1.1 Connector on port 8080
      -->
@@ -18,18 +18,18 @@
                 redirectPort="8443" />
      -->
      <!-- Define a SSL HTTP/1.1 Connector on port 8443
-@@ -83,12 +85,12 @@
-          described in the APR documentation -->
+@@ -86,12 +86,12 @@
+          documentation -->
      <!--
-     <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
--               maxThreads="150" scheme="https" secure="true"
-+               maxThreads="150" scheme="https" secure="true" URIEncoding="UTF-8"
+     <Connector port="8443" protocol="org.apache.coyote.http11.Http11Protocol"
+-               maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
++               maxThreads="150" SSLEnabled="true" scheme="https" secure="true" URIEncoding="UTF-8"
                 clientAuth="false" sslProtocol="TLS" />
      -->
  
      <!-- Define an AJP 1.3 Connector on port 8009 -->
 -    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
-+    <Connector port="8009" protocol="AJP/1.3" URIEncoding="UTF-8" redirectPort="8443" />
++    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" URIEncoding="UTF-8" />
  
  
      <!-- An Engine represents the entry point (within Catalina) that processes

diff --git a/tomcat-build.xml.patch b/tomcat-build.xml.patch
index a21a07ef6ce9b91225f8eb5071414a5e6f83de1c..b4b4e2dafec1b8d7d01e4284263112c9532bc94c 100644 (file)
--- a/tomcat-build.xml.patch
+++ b/tomcat-build.xml.patch
@@ -1,68 +1,7 @@
---- apache-tomcat-7.0.52-src/build.xml.orig    2014-02-13 08:40:56.000000000 +0100
-+++ apache-tomcat-7.0.52-src/build.xml 2014-02-28 11:21:53.676705236 +0100
-@@ -482,60 +482,6 @@
-     
-   </target>
- 
--  <target name="validate" if="${execute.validate}"
--    depends="build-prepare,compile-prepare,download-validate"
--    description="Uses Checkstyle tool to perform style check for the source code">
--    <!-- Required so we can cache checkstyle results -->
--    <mkdir dir="${tomcat.output}/res/checkstyle"/>
--
--    <taskdef resource="checkstyletask.properties"
--             classpath="${checkstyle.jar}" />
--    <checkstyle config="res/checkstyle/checkstyle.xml">
--      <fileset dir="." >
--        <patternset refid="text.files" />
--        <include name="**/*.bat"/>
--        <include name="**/*.sh"/>
--        <exclude name="bin/setenv.*"/>
--        <exclude name=".*/**"/>
--        <exclude name="output/**"/>
--        <exclude name="modules/**"/>
--        <exclude name="**/*.mdl"/>
--        <exclude name="**/*_2.xml"/>
--        <exclude name="res/checkstyle/header-al2.txt"/>
--        <!-- Exclude auto-generated files -->
--        <exclude name="java/org/apache/el/parser/ELParser*.java" />
--        <exclude name="java/org/apache/el/parser/Node.java" />
--        <exclude name="java/org/apache/**/parser/JJT*ParserState.java" />
--        <exclude name="java/org/apache/**/parser/ParseException.java" />
--        <exclude name="java/org/apache/**/parser/SimpleCharStream.java" />
--        <exclude name="java/org/apache/**/parser/Token*.java" />
--        <!-- Exclude these else Gump runs validate on them -->
--        <exclude name="**/org/apache/tomcat/dbcp/**"/>
--        <exclude name="**/tomcat-deps/**"/>
--        <!-- Exclude simple test files -->
--        <exclude name="test/webapp-3.0/bug53257/**/*.txt"/>
--        <exclude name="test/webapp-3.0-fragments/WEB-INF/classes/*.txt"/>
--      </fileset>
--      <fileset dir="modules/jdbc-pool" >
--        <exclude name=".*/**"/>
--        <exclude name="**/MANIFEST.MF"/>
--        <patternset refid="text.files" />
--      </fileset>
--    </checkstyle>
--    <!-- javax package checks -->
--    <checkstyle config="res/checkstyle/javax-checkstyle.xml">
--      <fileset dir="java/javax" >
--        <include name="**/*.java"/>
--      </fileset>
--    </checkstyle>
--    <!-- org package checks -->
--    <checkstyle config="res/checkstyle/org-checkstyle.xml">
--      <fileset dir="java/org" >
--        <include name="**/*.java"/>
--      </fileset>
--    </checkstyle>
--  </target>
--
-   <target name="validate-eoln" depends="build-prepare,compile-prepare"
-     description="Validate that the source files have correct line ends">
- 
-@@ -595,7 +541,7 @@
-   <target name="compile" depends="compile-java6,compile-java7" />
+--- apache-tomcat-7.0.63-src/build.xml~        2015-06-30 11:15:44.000000000 +0300
++++ apache-tomcat-7.0.63-src/build.xml 2015-07-26 21:31:46.613106110 +0300
+@@ -632,7 +574,7 @@
+   <target name="compile" depends="compile-java6,check-java7,compile-java7" />
  
    <target name="compile-java6"
 -          depends="build-prepare,download-compile,compile-prepare,validate">
@@ -84,12 +23,12 @@
      <!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
        <fileset dir="bin">
-@@ -1239,7 +1178,7 @@
+@@ -1198,7 +1198,7 @@
  
    </target>
  
--  <target name="test-compile" depends="compile,download-test-compile" >
-+  <target name="test-compile" depends="compile" >
+-  <target name="test-compile" depends="compile,download-test-compile,compile-webapp-examples" >
++  <target name="test-compile" depends="compile,compile-webapp-examples" >
      <mkdir dir="${test.classes}"/>
      <!-- Compile -->
      <javac srcdir="test" destdir="${test.classes}"
@@ -194,296 +133,3 @@
      <mkdir dir="${tomcat.dist}"/>
      <mkdir dir="${tomcat.dist}/bin"/>
      <mkdir dir="${tomcat.dist}/conf"/>
-@@ -2602,292 +2488,6 @@
-   </target>
- 
-     
--  <!-- ================ Download and dependency building =================== -->
--
--  <target name="download-validate"
--          description="Download components necessary to validate source"
--          if="${execute.validate}">
--
--    <antcall target="downloadzip">
--      <param name="sourcefile" value="${checkstyle.loc}"/>
--      <param name="destfile" value="${checkstyle.jar}"/>
--      <param name="destdir" value="${base.path}"/>
--    </antcall>
--
--  </target>
--
--  <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
--
--    <antcall target="downloadfile-2">
--      <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
--      <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
--      <param name="destfile" value="${tomcat-native.tar.gz}"/>
--      <param name="destdir" value="${tomcat-native.home}"/>
--    </antcall>
--
--    <!-- Download Commons Daemon -->
--    <antcall target="downloadgz-2">
--      <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
--      <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
--      <param name="destfile" value="${commons-daemon.jar}"/>
--    </antcall>
--
--    <antcall target="downloadfile-2">
--      <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
--      <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
--      <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
--      <param name="destdir" value="${commons-daemon.home}"/>
--    </antcall>
--
--    <!-- Download src and build Tomcat DBCP bundle -->
--    <antcall target="downloadgz-2">
--      <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
--      <param name="sourcefile.2" value="${commons-pool-src.loc.2}"/>
--      <param name="destfile" value="${commons-pool.home}/build.xml" />
--    </antcall>
--    <antcall target="downloadgz-2">
--      <param name="sourcefile.1" value="${commons-dbcp-src.loc.1}"/>
--      <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
--      <param name="destfile" value="${commons-dbcp.home}/build.xml" />
--    </antcall>
--    <mkdir dir="${tomcat-dbcp.home}"/>
--    <!-- Rebuild dbcp only if built jars do not exist -->
--    <!-- or new versions of pool or dbcp have been downloaded. -->
--    <condition property="no.build.dbcp">
--      <and>
--        <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp.jar}" />
--        <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp-src.jar}" />
--        <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp.jar}" />
--        <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp-src.jar}" />
--      </and>
--    </condition>
--    <antcall target="build-tomcat-dbcp" />
--
--    <!-- Download JDT (Eclipse compiler) -->
--    <antcall target="downloadfile-2">
--      <param name="sourcefile.1" value="${jdt.loc.1}"/>
--      <param name="sourcefile.2" value="${jdt.loc.2}"/>
--      <param name="destfile" value="${jdt.jar}"/>
--      <param name="destdir" value="${jdt.home}"/>
--    </antcall>
--  </target>
--
--  <target name="download-test-compile"
--          description="Download additional components for the tests" >
--
--    <antcall target="downloadfile">
--      <param name="sourcefile" value="${junit.loc}"/>
--      <param name="destfile" value="${junit.jar}"/>
--      <param name="destdir" value="${junit.home}"/>
--    </antcall>
--
--    <antcall target="downloadfile">
--      <param name="sourcefile" value="${hamcrest.loc}"/>
--      <param name="destfile" value="${hamcrest.jar}"/>
--      <param name="destdir" value="${hamcrest.home}"/>
--    </antcall>
--
--  </target>
--
--  <target name="download-cobertura"
--          if="${test.cobertura}"
--          description="Download the Cobertura code coverage tool" >
--
--    <antcall target="downloadgz">
--      <param name="sourcefile" value="${cobertura.loc}"/>
--      <param name="destfile" value="${cobertura.jar}"/>
--    </antcall>
--
--  </target>
--
--  <target name="download-dist"
--          description="Download additional components for a distribution" >
--
--    <antcall target="downloadzip-2">
--      <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
--      <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
--      <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
--      <param name="destdir" value="${tomcat-native.home}"/>
--    </antcall>
--
--    <antcall target="downloadzip-2">
--      <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
--      <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
--      <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
--      <param name="destdir" value="${commons-daemon.native.win.home}"/>
--    </antcall>
--
--    <antcall target="downloadzip">
--      <param name="sourcefile" value="${nsis.loc}"/>
--      <param name="destfile" value="${nsis.exe}"/>
--      <param name="destdir" value="${nsis.home}/.."/>
--    </antcall>
--
--  </target>
--
--
--  <!-- =============== Targets for dependencies that need to =============== -->
--  <!-- ================  be built rather than used directly ================ -->
--
--  <target name="build-tomcat-dbcp" depends="build-manifests" unless="no.build.dbcp">
--    <copy todir="${tomcat-dbcp.home}">
--      <fileset dir="${commons-pool.home}">
--        <include name="**/*.java" />
--        <exclude name="**/test/**" />
--      </fileset>
--      <fileset dir="${commons-dbcp.home}">
--        <include name="**/*.java" />
--        <exclude name="**/test/**" />
--        <exclude name="**/managed/**" />
--      </fileset>
--    </copy>
--    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
--        encoding="ISO-8859-1">
--      <replacefilter token="org.apache.commons"
--            value="org.apache.tomcat.dbcp" />
--    </replace>
--    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
--        encoding="ISO-8859-1">
--      <replacefilter token="enum"
--            value="enumeration" />
--    </replace>
--
--    <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
--    <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
--      <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
--    </move>
--    <mkdir dir="${tomcat-dbcp.home}/classes"/>
--    <javac destdir="${tomcat-dbcp.home}/classes"
--           debug="${compile.debug}"
--           deprecation="${compile.deprecation}"
--           source="${compile.source}"
--           target="${compile.target}"
--           sourcepath="${tomcat-dbcp.home}/src/java"
--           srcdir="${tomcat-dbcp.home}/src/java"
--           encoding="ISO-8859-1"
--           includeantruntime="false">
--      <include name="**" />
--    </javac>
--    <jarIt jarfile="${tomcat-dbcp.jar}"
--      filesDir="${tomcat-dbcp.home}/classes"
--      filesId="files.tomcat-dbcp" />
--    <jarIt jarfile="${tomcat-dbcp-src.jar}"
--      filesDir="${tomcat-dbcp.home}/src/java"
--      filesId="files.tomcat-dbcp" />
--  </target>
--
--  <!-- =============== Utility Targets to support downloads ================ -->
--
--  <target name="proxyflags">
--    <!-- check proxy parameters. -->
--    <condition property="useproxy">
--      <equals arg1="${proxy.use}" arg2="on" />
--    </condition>
--  </target>
--
--  <target name="setproxy" depends="proxyflags" if="useproxy">
--    <taskdef name="setproxy"
--            classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
--    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
--              proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
--    <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
--  </target>
--
--  <target name="testexist">
--    <echo message="Testing  for ${destfile}"/>
--    <available file="${destfile}" property="exist"/>
--  </target>
--
--  <target name="downloadgz" unless="exist" depends="setproxy,testexist">
--    <!-- Download and extract the package -->
--    <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${base.path}/file.tar.gz" />
--    <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
--    <untar src="${base.path}/file.tar" dest="${base.path}"/>
--    <delete file="${base.path}/file.tar"/>
--    <delete file="${base.path}/file.tar.gz"/>
--  </target>
--
--  <target name="downloadgz-2" unless="exist" depends="setproxy,testexist">
--    <!-- Download and extract the package from the two alternative locations -->
--    <delete file="${base.path}/file.tar" quiet="true" />
--    <delete file="${base.path}/file.tar.gz" quiet="true" />
--    <antcall target="trydownload">
--      <param name="sourcefile" value="${sourcefile.1}" />
--      <param name="destfile" value="${base.path}/file.tar.gz" />
--    </antcall>
--    <antcall target="trydownload">
--      <param name="sourcefile" value="${sourcefile.2}" />
--      <param name="destfile" value="${base.path}/file.tar.gz" />
--    </antcall>
--    <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
--    <untar src="${base.path}/file.tar" dest="${base.path}"/>
--    <delete file="${base.path}/file.tar"/>
--    <delete file="${base.path}/file.tar.gz"/>
--  </target>
--
--  <target name="downloadzip" unless="exist" depends="setproxy,testexist">
--    <!-- Download and extract the package -->
--    <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${base.path}/file.zip" />
--    <mkdir dir="${destdir}" />
--    <unzip src="${base.path}/file.zip" dest="${destdir}"/>
--    <delete file="${base.path}/file.zip"/>
--  </target>
--
--  <target name="downloadzip-2" unless="exist" depends="testexist">
--    <!-- Download and extract the package from the two alternative locations -->
--    <delete file="${base.path}/file.zip" quiet="true" />
--    <antcall target="trydownload">
--      <param name="sourcefile" value="${sourcefile.1}" />
--      <param name="destfile" value="${base.path}/file.zip" />
--    </antcall>
--    <antcall target="trydownload">
--      <param name="sourcefile" value="${sourcefile.2}" />
--      <param name="destfile" value="${base.path}/file.zip" />
--    </antcall>
--    <mkdir dir="${destdir}" />
--    <unzip src="${base.path}/file.zip" dest="${destdir}"/>
--    <delete file="${base.path}/file.zip"/>
--  </target>
--
--  <target name="downloadfile" unless="exist" depends="setproxy,testexist">
--    <!-- Download extract the file -->
--    <mkdir dir="${destdir}" />
--    <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
--  </target>
--
--  <target name="downloadfile-2" unless="exist" depends="testexist">
--    <!-- Download the file from the two alternative locations -->
--    <mkdir dir="${destdir}" />
--
--    <antcall target="trydownload">
--      <param name="sourcefile" value="${sourcefile.1}" />
--    </antcall>
--
--    <antcall target="trydownload">
--      <param name="sourcefile" value="${sourcefile.2}" />
--    </antcall>
--
--    <available file="${destfile}" property="exist"/>
--    <fail unless="exist" message="Failed to download [${destfile}]. All download sources are unavailable." />
--  </target>
--
--  <target name="trydownload.check" depends="setproxy">
--    <condition property="trydownload.run">
--      <and>
--        <not>
--          <available file="${destfile}" />
--        </not>
--        <http url="${sourcefile}" />
--      </and>
--    </condition>
--  </target>
--
--  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
--    <!-- Downloads a file if not yet downloaded and the source URL is available -->
--    <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
--  </target>
--
-   <!-- ============================ IDE Support ============================ -->
- 
-   <target name="ide-eclipse" depends="deploy, extras-webservices-prepare"

diff --git a/tomcat.spec b/tomcat.spec
index 97c4b134d6f7127d99e2bac1ad1f91a6f025dfab..4ca65b2e69ac9daf948017b0e75d8fca349ab613 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,6 +1,7 @@
 
 # Conditional build:
 %bcond_without javadoc         # skip building javadocs
+%bcond_without extras          # skip building extras
 
 %define                jspapiver       2.2
 %define                servletapiver   3.0
@@ -14,13 +15,12 @@
 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
-# check "dev-7.0.55" WIP branch before attempting to upgrade
-Version:       7.0.52
-Release:       3
+Version:       7.0.63
+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: 1b85c08721ab9d891b72ca35cd4a0e2d
+# Source0-md5: 29fbc490b99140a671e4c84d152caee7
 Source1:       apache-%{name}.init
 Source2:       apache-%{name}.sysconfig
 Source3:       %{name}-build.properties
@@ -39,22 +39,23 @@ 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
-BuildRequires: eclipse-jdt >= 4.2.2
 BuildRequires: java(JSR109)
 BuildRequires: java-avalon-framework
 BuildRequires: java-avalon-logkit
 BuildRequires: java-commons-daemon >= 1.0
 BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.1
 BuildRequires: java-commons-pool-tomcat5
+BuildRequires: java-eclipse-jdt >= 4.4.2
 BuildRequires: java-geronimo-spec-jaxrpc
 BuildRequires: java-jdbc-mysql
 BuildRequires: java-junit
 BuildRequires: java-log4j
 BuildRequires: java-mail
-BuildRequires: jdk
+BuildRequires: jdk >= 1.6
 BuildRequires: jpackage-utils
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpm-javaprov
@@ -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
@@ -307,13 +309,12 @@ export LC_ALL=en_US
 # Base package
 %ant
 
-# Extras
+%if %{with extras}
 install -d output/extras/webservices
-
 ln -sf %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
 ln -sf %{_javadir}/jsr109.jar output/extras/webservices/wsdl4j.jar
-
 %ant extras
+%endif
 
 # Javadoc
 %if %{with javadoc}
@@ -401,12 +402,14 @@ ln -sf %{_javadir}/tomcat-api.jar $TOMCATDIR/lib/api.jar
 
 ln -sf %{_javadir}/tomcat-coyote.jar $TOMCATDIR/lib/tomcat-coyote.jar
 
+%if %{with extras}
 cp -a ../extras/catalina-ws.jar $TOMCATDIR/lib/catalina-ws.jar
 cp -a ../extras/catalina-jmx-remote.jar $TOMCATDIR/lib/catalina-jmx-remote.jar
 cp -a ../extras/tomcat-juli-adapters.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-juli-adapters.jar
 cp -a ../extras/tomcat-juli.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-juli.jar
 ln -sf %{_javadir}/tomcat-juli-adapters.jar $TOMCATDIR/lib/juli-adapters.jar
 ln -sf %{_javadir}/tomcat-juli.jar $TOMCATDIR/lib/juli.jar
+%endif
 
 ln -s %{_javadir}/geronimo-spec-jaxrpc.jar $TOMCATDIR/lib/jaxrpc.jar
 ln -s %{_javadir}/jsr109.jar $TOMCATDIR/lib/jsr109.jar
@@ -497,8 +500,6 @@ fi
 %{_tomcatdir}/lib/jasper-el.jar
 %{_tomcatdir}/lib/jasper.jar
 %{_tomcatdir}/lib/jsp-api.jar
-%{_tomcatdir}/lib/juli-adapters.jar
-%{_tomcatdir}/lib/juli.jar
 %{_tomcatdir}/lib/mail.jar
 %{_tomcatdir}/lib/mysql-connector-java.jar
 %{_tomcatdir}/lib/org.eclipse.jdt.core.jar
@@ -511,6 +512,10 @@ fi
 %{_tomcatdir}/lib/tomcat7-websocket.jar
 %{_tomcatdir}/lib/websocket-api.jar
 %{_tomcatdir}/lib/util.jar
+%if %{with extras}
+%{_tomcatdir}/lib/juli-adapters.jar
+%{_tomcatdir}/lib/juli.jar
+%endif
 
 %dir %{_tomcatdir}/webapps
 
@@ -549,13 +554,17 @@ fi
 
 %files webservices
 %defattr(644,root,root,755)
-%{_tomcatdir}/lib/catalina-ws.jar
 %{_tomcatdir}/lib/jsr109.jar
 %{_tomcatdir}/lib/jaxrpc.jar
+%if %{with extras}
+%{_tomcatdir}/lib/catalina-ws.jar
+%endif
 
+%if %{with extras}
 %files jmx
 %defattr(644,root,root,755)
 %{_tomcatdir}/lib/catalina-jmx-remote.jar
+%endif
 
 %files -n java-tomcat-jasper
 %defattr(644,root,root,755)
@@ -566,9 +575,11 @@ fi
 %defattr(644,root,root,755)
 %{_javadir}/tomcat-api.jar
 %{_javadir}/tomcat-catalina.jar
+%{_javadir}/tomcat-util.jar
+%if %{with extras}
 %{_javadir}/tomcat-juli-adapters.jar
 %{_javadir}/tomcat-juli.jar
-%{_javadir}/tomcat-util.jar
+%endif
 
 %files -n java-tomcat-coyote
 %defattr(644,root,root,755)