diff --git a/apache-tomcat-7.0.42-src.tar.gz b/apache-tomcat-7.0.42-src.tar.gz
deleted file mode 100644
index 0846428..0000000
--- a/apache-tomcat-7.0.42-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5dbc2194b894de0b620752f18f5dc69901627f49b87d9dfb5951750bb9c20c72
-size 4422120
diff --git a/apache-tomcat-7.0.42-src.tar.gz.asc b/apache-tomcat-7.0.42-src.tar.gz.asc
deleted file mode 100644
index 83620f2..0000000
--- a/apache-tomcat-7.0.42-src.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (MingW32)
-
-iQIcBAABAgAGBQJR0okBAAoJEBDAHFovYFnnOGIP/0BLyBwPIDb0SiYtTNJPEW1x
-SP0DXVHO66ptX5kmGcTBVEUdPsRDL5hl4Uhg38v/CCu9osmtb/TYrg1zQ/DNcZN4
-5MtXZ++ciRIrOHLYGaehzEKnz8K5b8G3dC6K3oECQfXLDKsHBwI939Ms9nBmJ92/
-MpZzuP0KVI4TKWGdSSe6z5ffShVW4poHPS4ie8TJxp+fUWi7B4h17xK4H1xynZXo
-1e3AY5HCnK+7PFJSq8vhhAITmOsg+DXbwEL3r057dvbpTltd9SgIqdCbCf7xWDVY
-iI/GplGMgNiUw1TGnmmdqA0eyBwzuFp/zdh2/M/X3cQ25dAOV/7Do9e9FWwA9Xj5
-X1u8e0Emcm1VmbVnbky+WokFExVcMa87pH0Im2DDhw4xltoTGrzExFfPVgmiFV56
-+6YIUsHUS+rnLUXhosGIPnNHkE3lhbkkQ9UhvxMNOQpoTFwzT5yUhBKCfXLtxgil
-OIY7yysAfgMQq9ziRBQ9k39sqHonTBUrsH+NDEdr/fVD6FQtVkykeviRact2nh26
-y6+Am2yqK/+Xbn7lRgZCYMdi3T1mZmFZvVm4/oa1/HdySjmdY1quwgznHDkkzEI3
-na76VnLtVsx0JwnildUwRku2uyGmXT+LniD3Yrc9HixNG4jQXCxEbN4VDI5Nweh7
-WiiE3SKwQGGDhVaNkxmN
-=i6GQ
------END PGP SIGNATURE-----
diff --git a/apache-tomcat-7.0.47-src.tar.gz b/apache-tomcat-7.0.47-src.tar.gz
new file mode 100644
index 0000000..14cc8c9
--- /dev/null
+++ b/apache-tomcat-7.0.47-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be7cad1c70b9db84e8b139a81312ecd80761f2e69edbd1d176d49e52f728bc99
+size 4568824
diff --git a/apache-tomcat-7.0.47-src.tar.gz.asc b/apache-tomcat-7.0.47-src.tar.gz.asc
new file mode 100644
index 0000000..ca78700
--- /dev/null
+++ b/apache-tomcat-7.0.47-src.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.21 (MingW32)
+
+iQIcBAABCgAGBQJSYQ88AAoJECCLCrHWMBHHYcQP/RwMofLVtWTfFi5jRpfyx9Sr
+v2VT9XXZ9tIUIj1gEbncG2vy3agV9GuIPd8Hs4ONmte5UC0+hKEgLNaEDXL9I51e
+VOKCVSZxdav+8Sa5IKVzzCwwUSRwqY5lr4/uHWW94U8kBPwvC7M1x+IABxV745Cp
+0FJu9nMRKbKOLIi7gv5whb50An0/UAe5xPhpRVu6u+I/Gn9HqAIkLvqo7iPnEANS
+DXale2pYe9t3YFnjk96svdZP7bKGbtb8WoNe4n+ONbJqFK8oUw04ExR9zhAks+MZ
+/5yuwXPlpb7vCBavzb1WX5kbQ2ERGbx5XbAHMvAPfgskAYkxuTZvzsVV+V3NCOUb
+C2eR8Q6Kt+WzTDoGACfJWUIhcgb7vg8r9zpsOg+RZ7stjw7XC5Z/VS4brgDjz6Ew
+1zlTP7180CO3pnjJyFjYPumj3nqYEENycttSjtPgEhPkp/A6n04U/3COdIMHIRDF
+pZWFwotOgyndn+a528NIJhukyXgEHOUYf7NMo33Cmf4xlMOhwHchDNTbF2o4Bs+H
+OD6SbFaJwker7jiGCDf5jikLPz850ul0d14uyPAINoqWkT/+1f0LCWV//IcKXDjs
+8JA8YCA+hoEMUn8VpMywSPFHIX37i95g4iKaijQsbfFAUWe9m6L+VjTW7wa9EYvj
+B3tdkoaRjzzjrgvM580e
+=HaR4
+-----END PGP SIGNATURE-----
diff --git a/collections-tomcat-build.xml b/collections-tomcat-build.xml
new file mode 100644
index 0000000..522f9ed
--- /dev/null
+++ b/collections-tomcat-build.xml
@@ -0,0 +1,70 @@
+<project name="commons-collections-tomcat5" default="build" basedir=".">
+
+   <property name="tomcat-collections.home" value="collections-tomcat5"/>
+   <property name="commons-collections.home" value="."/>
+   <property name="tomcat-collections.jar" value="commons-collections-tomcat5.jar"/>
+
+   <!-- Java Options -->
+   <property name="compile.debug" value="true"/>
+   <property name="compile.deprecation" value="false"/>
+   <property name="compile.source" value="1.4"/>
+
+   <target name="clean">
+     <delete dir="${tomcat-collections.home}"/>
+   </target>
+
+<target name="build">
+    <copy todir="${tomcat-collections.home}">
+        <fileset dir="${commons-collections.home}" >
+            <include name="**/collections/CursorableLinkedList.java" />
+            <include name="**/collections/KeyValue.java" />
+            <include name="**/collections/LRUMap.java" />
+            <include name="**/collections/SequencedHashMap.java" />
+        </fileset> 
+<!--        <fileset dir="${commons-pool.home}">
+            <include name="**/*.java" />
+            <exclude name="**/Stack*.java" />
+            <exclude name="**/SoftReferenceObjectPool.java" />
+            <exclude name="**/test/**" />
+        </fileset> 
+        <fileset dir="${commons-dbcp.home}">
+            <include name="**/*.java" />
+            <exclude name="**/test/**" />
+            <exclude name="${tomcat-dbcp.home}/**"/>
+        </fileset> -->
+    </copy>
+    <replace dir="${tomcat-collections.home}/src/java/org/apache/commons">
+        <replacefilter token="return UnmodifiableList.decorate(l);"
+            value="return l;" />
+        <replacefilter token="import org.apache.commons.collections.list.UnmodifiableList;"
+            value=" " />
+    </replace>
+    <replace dir="${tomcat-collections.home}/src/java/org/apache/commons" >
+        <replacefilter token="org.apache.commons"
+            value="org.apache.tomcat.dbcp" />
+    </replace>
+    <mkdir dir="${tomcat-collections.home}/src/java/org/apache/tomcat/dbcp" />
+    <move todir="${tomcat-collections.home}/src/java/org/apache/tomcat/dbcp">
+        <fileset dir="${tomcat-collections.home}/src/java/org/apache/commons" />
+    </move>
+    <mkdir dir="${tomcat-collections.home}/classes"/>
+    <javac destdir="${tomcat-collections.home}/classes"
+           optimize="off"
+           debug="${compile.debug}"
+           deprecation="${compile.deprecation}"
+           source="${compile.source}"
+           sourcepath="${tomcat-collections.home}/src/java"
+           srcdir="${tomcat-collections.home}/src/java" >
+      <include name="**" />
+    </javac>
+    <jar destfile="${tomcat-collections.home}/${tomcat-collections.jar}"
+         index="true">
+       <fileset dir="${tomcat-collections.home}/classes">
+          <include name="**/*.class" />
+          <include name="**/*.properties" />
+       </fileset>
+    </jar>
+  </target>
+
+</project>
+
diff --git a/dbcp-tomcat-build.xml b/dbcp-tomcat-build.xml
new file mode 100644
index 0000000..e69dcb6
--- /dev/null
+++ b/dbcp-tomcat-build.xml
@@ -0,0 +1,71 @@
+<!-- $Id: build.xml,v 1.25 2004/05/20 16:30:30 dirkv Exp $ -->
+<project name="commons-dbcp-tomcat5" default="build" basedir=".">
+
+   <property name="tomcat-dbcp.home" value="dbcp-tomcat5"/>
+   <property name="commons-dbcp.home" value="."/>
+   <property name="tomcat-dbcp.jar" value="commons-dbcp-tomcat5.jar"/>
+
+   <!-- Java Options -->
+   <property name="compile.debug" value="true"/>
+   <property name="compile.deprecation" value="false"/>
+   <property name="compile.source" value="1.5"/>
+
+   <target name="clean">
+     <delete dir="${tomcat-dbcp.home}"/>
+   </target>
+
+<target name="build">
+    <copy todir="${tomcat-dbcp.home}">
+<!--        <fileset dir="${commons-collections.home}" >
+            <include name="**/collections/CursorableLinkedList.java" />
+            <include name="**/collections/KeyValue.java" />
+            <include name="**/collections/LRUMap.java" />
+            <include name="**/collections/SequencedHashMap.java" />
+        </fileset>
+        <fileset dir="${commons-pool.home}">
+            <include name="**/*.java" />
+            <exclude name="**/Stack*.java" />
+            <exclude name="**/SoftReferenceObjectPool.java" />
+            <exclude name="**/test/**" />
+        </fileset> -->
+        <fileset dir="${commons-dbcp.home}">
+            <include name="**/*.java" />
+            <exclude name="**/test/**" />
+            <exclude name="${tomcat-dbcp.home}/**"/>
+        </fileset>
+    </copy>
+    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons">
+        <replacefilter token="return UnmodifiableList.decorate(l);"
+            value="return l;" />
+        <replacefilter token="import org.apache.commons.collections.list.UnmodifiableList;"
+            value=" " />
+    </replace>
+    <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons" >
+        <replacefilter token="org.apache.commons"
+            value="org.apache.tomcat.dbcp" />
+    </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 target="1.5" destdir="${tomcat-dbcp.home}/classes"
+           optimize="off"
+           debug="${compile.debug}"
+           deprecation="${compile.deprecation}"
+           source="${compile.source}"
+           sourcepath="${tomcat-dbcp.home}/src/java"
+           srcdir="${tomcat-dbcp.home}/src/java" >
+      <include name="**" />
+    </javac>
+    <jar destfile="${tomcat-dbcp.home}/${tomcat-dbcp.jar}"
+         index="true">
+       <fileset dir="${tomcat-dbcp.home}/classes">
+          <include name="**/*.class" />
+          <include name="**/*.properties" />
+       </fileset>
+    </jar>
+  </target>
+
+</project>
+
diff --git a/tomcat-7.0.service b/tomcat-7.0.service
index abe262f..7d75bfc 100644
--- a/tomcat-7.0.service
+++ b/tomcat-7.0.service
@@ -18,6 +18,7 @@ ExecStop=/usr/sbin/tomcat-sysd stop
 StandardOutput=syslog
 SyslogIdentifier=%n
 SyslogFacility=daemon
+SuccessExitStatus=143
 
 [Install]
 WantedBy=multi-user.target
diff --git a/tomcat.changes b/tomcat.changes
index 09b50f8..a6da5e4 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Nov  4 14:12:40 UTC 2013 - mvyskocil@suse.com
+
+- Update to 4.0.47
+  * bugfix release
+  * backport of JSR-356 Java WebSocket 1.0
+  * package tomcat now requires java7 at lease
+- Updated tomcat.keyring to reflect the fact new release is signed by
+  Violeta Georgieva / D63011C7
+  see http://osdir.com/ml/dev-tomcat.apache.org/2013-10/msg00849.html
+- Add tomcat-dbcp.jar (bnc#847505) back into tomcat lib dir
+- Install tomcat-coyote.jar as well
+- Remove pointless scriplets
+
 -------------------------------------------------------------------
 Mon Sep  9 11:06:25 UTC 2013 - tchvatal@suse.com
 
diff --git a/tomcat.keyring b/tomcat.keyring
index 3fece42..b645a40 100644
--- a/tomcat.keyring
+++ b/tomcat.keyring
@@ -1,55 +1,56 @@
-pub   4096R/2F6059E7 2009-09-18
-uid                  Mark E D Thomas <markt@apache.org>
-sub   4096R/5E763BEC 2009-09-18
+pub   4096R/D63011C7 2013-09-19
+uid                  Violeta Georgieva Georgieva (CODE SIGNING KEY) <violetagg@apache.org>
+sub   4096R/30480593 2013-09-19
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-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
-=8gQ0
+mQINBFI6WiwBEAD+kkswnsY8eaqvYkS+ZB5MJr7juWrv9Lw9OGsIXFlTvD1XK01c
+E8k4+uA2sOtaXQ5wTMdc5N3YzAXqFxplWuafQgEvhyTTq37M5YCxvtYEZy/EHQYT
+iok5H97lMRKbhLdZB+wkdsa0P/L1FveCUiEawKY/Rrfi+UeRAneSV+m7S+RrPphZ
+M9aNSczqYKfAqlpUAlUcrF/bt59vjhepoHcE4ev6SB+PCs0vbvX4iTvvZCTk1lZ9
+InS2wdK80Jz9pRB0Uf3LEnZxt9e3RkIFdQOCcEISmNlBKQQKFG+zCpIAbVoMLKEw
+rXWl8mLzGzBbhGmLpFroem3Ln1YiAxUqnPR/MoBquYnpTINwePgwKVWyQ1TXG2MF
+Z7DPayBMN+G51rfLS/8iy35pAnNeqbWQjavdUis6/0aRMv5EYMFMAerutQ5v99bA
+rGj6OL3R6repJLOGT4YWcD/Tw+eU1lMWxbq8BbbRU9Fd0iVFhFyKB/DQSxofvTCe
+PdWXRrptrE0/SmvuoTRVPmB21WyJenKdNmVOQ6U+W1Rs+5IKAdWWrGPcUt0qTrRC
+SL8vAQ7MejYLovFtRHslJRs7T3ratpRcQUNOx1jytJhmSUJktNWZWNHqBTe/eOAU
+Yr+QAkQVQXvRVWzHkDHQRTOFmNYIDZYRkzSP19sBWRnYdCs6CbIVPgMJVwARAQAB
+tEVWaW9sZXRhIEdlb3JnaWV2YSBHZW9yZ2lldmEgKENPREUgU0lHTklORyBLRVkp
+IDx2aW9sZXRhZ2dAYXBhY2hlLm9yZz6JAjcEEwEKACEFAlI6WiwCGwMFCwkIBwMF
+FQoJCAsFFgIDAQACHgECF4AACgkQIIsKsdYwEccMXA/+KMQKWfw2T2CXLhqvQLoh
+Irj1Vi9leAttKqKp2NCHLK1jf1qKzUx5U81VvizIGUsDXGlAvnnavrj+hmQqZdsO
+CoJAo7ViIR1ZhNca1tFK4Sy03wdpNyUkvxVuC+3peXmwhjPJoqU2ONCuDl/bCczl
+QAQpgZCMO93h45U9H6JkjqK01aDorQHxvXo+Ap2IViQvDkNtJ515vG2k5K+x2XHw
+Tv19wr5N2rz407TWKzS5hh7QHRgg+PZs/zPf1YHD7Tg5K6vvmZd+5EsDrse6tZXy
+mzz2+8Yg1SNa765Aq6p1uAQf5NKeej/25TbRYT7RyIlgDXPcPrKxy0cKzpqFqCFs
+jJEcN3NlQq+f1tOvUk8cQQS0G+Qws3EU7I74z8KaUfqmO/5ROrXLS50cKC9CODO0
+UFY8FbJDGzS5cFSBlqXYLeQvaOMg0LsV6wZLu6brxEsRYjSpwM8yBFO4bMcTxt4P
+VYtinNZ+6ude8mMz6BK/0/XbAL6rc5jwO2xj7GTCFNRTWOa8IGtwqg3qnAiHcg/V
+bTBQCOmzMujHBXLnZu6vg79BwzE7Ikq634D6HEwi1bC3XuVz+7NqdUQAGPSapwUo
++0wC5DVwdjhe1zWcf2Zc45HWsx0HaGW28x/tBrw78fgwrSSyV2xunbxGpVaaysTy
+Oini8V70uLofn1SHtxvEQCm5Ag0EUjpaLAEQAKV7FnaAcxkzDa7zjrAgLRho44KM
++lBt28+5KO3Jye1Lpf2+4aspu0PXkGW2Twv2tBQNZYs2CWF+vnHNUDuU8TkSpPt+
+2PRSZrQ0K+IpQF/qY3Wf+LYWFNXk5/wHJLGiQv/008svtupng6Ov39JwCNQ1iG3d
+nSWfnqHwQULyE7JcZf1It94G43+6NBvKakstOdK7d40dVhmRIKDdJkWhN3MKrGab
+FGFAF2Nb57IugQ9QO6Ve/BnjKZmJg7TyUZk27LVTC0aUQgGgDOvsF2Iw95IplCZ/
+jVbwdBGjeCStvI3c0DB+E2xwJ0g2Wf/CBLvmU9GKOW0toBfRUXFbfzNTJfW8kglt
+pDuELsVY5vHHxgujdDInHuTW1930zUw0cNA2+ai3sf+UGejh0e3nGfy1uOK3YQ6H
+2YWgqXlOkri9pMlE0NJo/3PW9QDu0YRplGl65k+GtHD2La1akq5V5Et0VNaOypBP
+OqnUM08LofAS126Kerm7uBSUQDDV6t1VTOBgPW5cJF9I8kdp04pzj4qb/3fuOuGc
+kBRfmO/Vkug8U81w/TnxX6EYGy5fyA4JFBJl++waPS/9dXhVnA0qXEivzw9gNQvC
+uXYcM3nm4yUrOouC/OlC1cS+6Wxjrx6qn3NnsVzMCtefNK93+TdheZ0cJrMhJKkW
+v+qttOzPIleqvDK9ABEBAAGJAh8EGAEKAAkFAlI6WiwCGwwACgkQIIsKsdYwEcdN
+tQ/+L8cw9Z9tfrqovO1fGFQwCSaomShsbjoUb5AR3Hj3OuPGwXd8J62mrw+RnGN+
+0w2RyTz52izYvcoB1jmMFQwqi7vM5KCbw6KA8oRX58WSqiWCIwpbUuTODvJrSXjX
+pz/J/d+PVZi8T1HAu5HxDqNC1XR+eUd1xA9Pgnmmw99+0rmzES7xexWADXo/RRPH
+mDCxGK3UKMHDYJLTx8D3MacMitzQulxVo9xWwH1C7ioL3o5zCv2mfIl32WNjqwpD
+h4gNpnAGRthizeYTgyJM9nCrSWgeE+izGZ9F0g5uXzhyk1f6jlUmXiwjMu/XOcJO
+5Rr1e42bWITuP49nB2QbdSqVvVscwCd5TEpOnQtVNZGsss/wQHXDmGSVrYYUQwO/
+cUrU+hTti1IJXgyFi7F1oxde+LCUxXmizKGoY96dVN+TYH5c17ub1/4/DYpOmcly
+tsQ2TOV0BqK4rgKLGfg2mA4zIFOdqXeGefLQVAF5fFzjFKKDi0ewp3sqy+ed6mKY
+1M/HmRX/YzIouFZ3ChFPIpeY23XxJC0BXkWR4pS7qxnelrWBZ+UbleNr9uHat5rC
+B77712dCT9zz85b380DnuMkrgz4HCnHuTcbHXIF1J604lars6ZrjtBvX+OsRHt7V
+f72qKJufP+n01xliW68LP4v93auM8nuE4kkEJ8ncHyuDq/Q=
+=fM0q
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/tomcat.spec b/tomcat.spec
index 966342d..7d1c0cd 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -26,7 +26,7 @@
 
 %define major_version 7
 %define minor_version 0
-%define micro_version 42
+%define micro_version 47
 
 %define packdname apache-tomcat-%{version}-src
 %define tcuid 91
@@ -70,6 +70,7 @@ Source15:       tomcat-api-OSGi-MANIFEST.MF
 Source16:       tomcat-juli-OSGi-MANIFEST.MF
 Source17:       tomcat-7.0-tomcat-sysd
 Source20:       tomcat-7.0-jsvc.service
+Source30:       dbcp-tomcat-build.xml
 Source1000:     tomcat-rpmlintrc
 Source1001:     http://www.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz.asc
 Source1002:     %{name}.keyring
@@ -95,9 +96,11 @@ BuildRequires:  gpg-offline
 BuildRequires:  jakarta-commons-collections
 BuildRequires:  jakarta-commons-daemon
 BuildRequires:  jakarta-commons-dbcp
+BuildRequires:  jakarta-commons-dbcp-src
 BuildRequires:  jakarta-commons-pool
+BuildRequires:  jakarta-commons-pool-tomcat5
 BuildRequires:  jakarta-taglibs-standard >= 1.1
-BuildRequires:  java-devel >= 1.6.0
+BuildRequires:  java-devel >= 1.7.0
 BuildRequires:  javapackages-tools
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
@@ -217,10 +220,11 @@ Requires:       %{name}-el-%{elspec}-api = %{version}-%{release}
 Requires:       %{name}-jsp-%{jspspec}-api = %{version}-%{release}
 Requires:       %{name}-servlet-%{servletspec}-api = %{version}-%{release}
 Requires(post): ecj >= 4.2.1
-#Requires(post): jakarta-commons-collections-tomcat5
-#$Requires(post): jakarta-commons-dbcp-tomcat5
-#Requires(post): jakarta-commons-pool-tomcat5
+#Requires(post): jakarta-commons-dbcp-tomcat5
+Requires(post): jakarta-commons-pool-tomcat5
 Requires(preun):%{__rm}
+Provides:       jakarta-commons-dbcp-tomcat5 = 1.4
+Obsoletes:      jakarta-commons-dbcp-tomcat5 < 1.4
 
 %description lib
 Libraries needed to run the Tomcat Web container
@@ -251,8 +255,6 @@ Requires(post): jakarta-taglibs-standard >= 1.1
 %description webapps
 The ROOT and examples web applications for Apache Tomcat
 
-
-
 %prep
 
 %if 0%{?suse_version} > 1220
@@ -268,6 +270,18 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch2 -p1
 
 %build
+#bnc847505: build all commons-dbcp-tomcat jars before tomcat
+#           so we broke the build cycle between commons-dbcp and tomcat
+
+mkdir -p commons/dbcp
+pushd commons/dbcp
+cp %{SOURCE30} .
+mkdir src
+cp -r %{_usrsrc}/commons-dbcp/java src/
+export CLASSPATH=$(build-classpath commons-pool-tomcat5)
+ant -f dbcp-tomcat-build.xml
+popd
+
 %{__ln_s} $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar
 %{__ln_s} $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar
 
@@ -283,6 +297,7 @@ touch HACK
 touch HACKDIR/build.xml
 
 %{ant} -Dbase.path="." \
+    -Djava.7.home="%{java_home}" \
     -Dbuild.compiler="modern" \
     -Dcommons-collections.jar="$(build-classpath commons-collections)" \
     -Dcommons-daemon.jar="$(build-classpath commons-daemon)" \
@@ -301,12 +316,12 @@ touch HACKDIR/build.xml
     -Dno.build.dbcp=true \
     -Dversion="%{version}" \
     -Dversion.build="%{micro_version}" \
-    deploy dist-prepare dist-source javadoc
+    deploy dist-prepare dist-source javadoc package-java7
 
 # remove some jars that we'll replace with symlinks later
 %{__rm} output/build/bin/commons-daemon.jar \
         output/build/lib/ecj.jar \
-        output/build/lib/commons-dbcp.jar
+        output/build/lib/*commons-dbcp.jar
 # remove the cruft we created
 %{__rm} output/build/bin/tomcat-native.tar.gz
 
@@ -378,6 +393,8 @@ pushd output/build
     %{__cp} -a lib/*.jar %{buildroot}%{libdir}
     %{__cp} -a webapps/* %{buildroot}%{appdir}
 popd
+# bnc#847505: add missing tomcat-dbcp.jar
+%{__cp} -a commons/dbcp/dbcp-tomcat5/commons-dbcp-tomcat5.jar %{buildroot}/%{libdir}/tomcat-dbcp.jar
 
 # javadoc
 %{__cp} -a output/dist/webapps/docs/api/* %{buildroot}%{_javadocdir}/%{name}
@@ -472,6 +489,19 @@ popd
 pushd %{buildroot}%{appdir}/sample
 %{jar} xf %{buildroot}%{appdir}/docs/appdev/sample/sample.war
 popd
+
+# Allow linking for example webapp
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{appdir}/examples/META-INF
+pushd ${RPM_BUILD_ROOT}%{appdir}/examples/META-INF
+echo '<?xml version="1.0" encoding="UTF-8"?>'>context.xml
+echo '<Context allowLinking="true"/>'>>context.xml
+popd
+
+pushd ${RPM_BUILD_ROOT}%{appdir}/examples/WEB-INF/lib
+%{__ln_s} -f $(build-classpath jakarta-taglibs-core) jstl.jar
+%{__ln_s} -f $(build-classpath jakarta-taglibs-standard) standard.jar
+popd
+
 %{__rm} %{buildroot}%{appdir}/docs/appdev/sample/sample.war
 
 # Install the maven metadata
@@ -505,6 +535,9 @@ done
 %{__cp} -a tomcat-tribes.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
 %add_maven_depmap JPP.%{name}-catalina-tribes.pom %{name}/catalina-tribes.jar
 
+%{__cp} -a tomcat-coyote.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
+%add_maven_depmap JPP.%{name}-tomcat-coyote.pom %{name}/tomcat-coyote.jar
+
 %{__cp} -a tomcat-juli.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
 %add_maven_depmap JPP.%{name}-tomcat-juli.pom %{name}/tomcat-juli.jar
 
@@ -611,24 +644,12 @@ if [ "$1" = "0" ]; then
 fi
 
 %post lib
-# HACK! The commons-dbcp-tomcat5 needs the tomcat-lib to build, but tomcat
-# needs this only as post/un dependency to create a symlink, not for build of
-# itself. This is mainly for succesfully build, in the production case it
-# should not happen!
-build-jar-repository %{libdir} \
-        commons-collections-tomcat5 \
-        commons-dbcp-tomcat5 \
-        commons-pool-tomcat5 \
-        ecj 2>&1 || exit 0
-
-%preun lib
-if [ "$1" = "0" ]; then
-    %{__rm} -f \
-        %{libdir}/\[commons-collections-tomcat5\].jar \
-        %{libdir}/\[commons-dbcp-tomcat5\].jar \
-        %{libdir}/\[commons-pool-tomcat5\].jar \
-        %{libdir}/\[ecj\].jar >/dev/null 2>&1
-fi
+# those links are no longer needed
+%{__rm} -f \
+    %{libdir}/\[commons-collections-tomcat5\].jar \
+    %{libdir}/\[commons-dbcp-tomcat5\].jar \
+    %{libdir}/\[commons-pool-tomcat5\].jar \
+    %{libdir}/\[ecj\].jar >/dev/null 2>&1
 
 %files
 %defattr(0644,root,root,0755)
@@ -723,6 +744,7 @@ fi
 %{_mavenpomdir}/JPP.%{name}-jasper.pom
 %{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
 %{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
+%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom
 %{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
 %exclude %{libdir}/%{name}-el-%{elspec}-api.jar
 # bnc#418664