diff --git a/apache-commons-pool.changes b/apache-commons-pool.changes
index 40957ed..42efcaa 100644
--- a/apache-commons-pool.changes
+++ b/apache-commons-pool.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Sep 29 10:59:24 UTC 2016 - tchvatal@suse.com
+
+- Rename from jakarta-commons-pool to apache-commons-pool
+- Version update to 1.6:
+  * drop the tomcat5 package, we need pool2 to work with new tomcat
+  * Last and final from the pool1 series, new pool2 was introduced
+    for future developement.
+
 -------------------------------------------------------------------
 Mon Sep  9 11:05:48 UTC 2013 - tchvatal@suse.com
 
diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec
index 5319e6e..169c455 100644
--- a/apache-commons-pool.spec
+++ b/apache-commons-pool.spec
@@ -19,21 +19,13 @@
 %define base_name       pool
 %define short_name      commons-%{base_name}
 Name:           apache-commons-pool
-Version:        1.3
+Version:        1.6
 Release:        0
 Summary:        Apache Commons Pool
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 Url:            https://commons.apache.org/proper/commons-pool/
-Source0:        http://www.apache.org/dist/jakarta/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.bz2
-Source1:        pom-maven2jpp-depcat.xsl
-Source2:        pom-maven2jpp-newdepmap.xsl
-Source3:        pom-maven2jpp-mapdeps.xsl
-Source4:        %{base_name}-%{version}-jpp-depmap.xml
-Source5:        commons-build.tar.bz2
-Source6:        pool-tomcat5-build.xml
-Source7:        commons-pool-maven-build.dtd
-Source8:        commons-pool-commons.ent
+Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Patch0:         jakarta-commons-pool-build.patch
 BuildRequires:  ant
 BuildRequires:  java-devel
@@ -66,40 +58,19 @@ of an interface that makes these implementations interchangeable.
 This package contains the javadoc documentation for the Jakarta Commons
 Pool Package.
 
-%package tomcat5
-Summary:        Jakarta Commons Pool Package
-Group:          Development/Libraries/Java
-Provides:       jakarta-commons-pool = %{version}
-Obsoletes:      jakarta-commons-pool < %{version}
-
-%description tomcat5
-The goal of the Pool package is to create and maintain an object
-(instance) pooling package to be distributed under the ASF license. The
-package supports a variety of pool implementations, but encourages
-support of an interface that makes these implementations
-interchangeable.
-
 %prep
 %setup -q -n %{short_name}-%{version}-src
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
-bzip2 -dc %{SOURCE5} | tar xf -
 %patch0
-cp %{SOURCE6} .
 
 %build
-mkdir ./tmp
-ant -Djava.io.tmpdir=. clean dist
-#commons-pool-tomcat5
-ant -f pool-tomcat5-build.xml
 ant -Djava.io.tmpdir=. clean dist
 
 %install
 # jars
 install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-#tomcat5 jar
-install -m 644 pool-tomcat5/%{short_name}-tomcat5.jar %{buildroot}%{_javadir}/%{name}-tomcat5-%{version}.jar
+install -m 644 dist/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
 (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
 (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 # javadoc
@@ -114,10 +85,6 @@ cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
 %{_javadir}/%{short_name}.jar
 %{_javadir}/%{short_name}-%{version}.jar
 
-%files tomcat5
-%defattr(0644,root,root,0755)
-%{_javadir}/*-tomcat5*.jar
-
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}
diff --git a/commons-build.tar.bz2 b/commons-build.tar.bz2
deleted file mode 100644
index d8ebf5f..0000000
--- a/commons-build.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cca660848595ef4d1bf21943eb6a7dc52f7dcbe476f1dee79b83f5085005b7b2
-size 98979
diff --git a/commons-pool-1.3-src.tar.bz2 b/commons-pool-1.3-src.tar.bz2
deleted file mode 100644
index f04b7c8..0000000
--- a/commons-pool-1.3-src.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:03050bdb2287a3d269f38660f0cac562533224e8e56addd5dfd146859b2efb8e
-size 292016
diff --git a/commons-pool-1.6-src.tar.gz b/commons-pool-1.6-src.tar.gz
new file mode 100644
index 0000000..f300fca
--- /dev/null
+++ b/commons-pool-1.6-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31d182e5dc857666dba640caf9529158c679075f4f137deceff128e268d9195a
+size 321409
diff --git a/commons-pool-commons.ent b/commons-pool-commons.ent
deleted file mode 100644
index 57c1e02..0000000
--- a/commons-pool-commons.ent
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--  
-The 'Commons' menu elements - used if not using commons-site.jsl
--->
-<menu name="Commons" type="footer">
-    <item name="Home"                  href="http://jakarta.apache.org/commons/" />
-    <item name="Components"            href="http://jakarta.apache.org/commons/components.html" collapse="true">
-        <item name="Full list..."      href="http://jakarta.apache.org/commons/components.html"/>
-    </item> 
-    <item name="Sandbox"               href="http://jakarta.apache.org/commons/sandbox/index.html" collapse="true">
-        <item name="Full list..."      href="http://jakarta.apache.org/commons/sandbox/index.html"/>
-    </item>
-    <item name="Dormant"               href="http://jakarta.apache.org/commons/dormant/index.html" collapse="true">
-        <item name="Full list..."      href="http://jakarta.apache.org/commons/dormant/index.html"/>
-    </item>
-    <item name="Volunteering"          href="http://jakarta.apache.org/commons/volunteering.html"/>
-    <item name="Contributing Patches"  href="http://jakarta.apache.org/commons/patches.html"/>
-    <item name="Building Components"   href="http://jakarta.apache.org/commons/building.html"/>
-    <item name="Releasing Components"  href="http://jakarta.apache.org/commons/releases/index.html"/>
-    <item name="Wiki"                  href="http://wiki.apache.org/jakarta-commons/FrontPage"/>
-</menu>
diff --git a/commons-pool-maven-build.dtd b/commons-pool-maven-build.dtd
deleted file mode 100644
index 766051c..0000000
--- a/commons-pool-maven-build.dtd
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-
-This DTD is intended to contain entity definitions for the main menu elements
-from the commons navigation bar.
-A mavenized project can then add there elements to their navigation bar by simply
-adding the DTD definition and then using the entities definied.
-
-For example:
-
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE org.apache.commons.menus SYSTEM 'http://jakarta.apache.org/commons/build/maven-build.dtd'>
-<project name="Component">
-  <title>Component</title>
-  <body>
-    <menu name="Component">
-      <item name="Overview"                href="/index.html"/>
-      ...
-    </menu>
-    ...
-    &commons;
-  </body>
-</project>
-
--->
-
-  <!ENTITY commons SYSTEM "http://jakarta.apache.org/commons/build/commons.ent">
diff --git a/jakarta-commons-pool-build.patch b/jakarta-commons-pool-build.patch
index ee8cb2e..52f69ea 100644
--- a/jakarta-commons-pool-build.patch
+++ b/jakarta-commons-pool-build.patch
@@ -1,11 +1,13 @@
---- build.xml.orig	2006-09-25 15:20:08.000000000 -0400
-+++ build.xml	2006-09-25 15:20:27.000000000 -0400
-@@ -93,7 +93,7 @@
-                nonavbar="false"
-                serialwarn="false"
-                source="1.3">
--          <link href="http://java.sun.com/j2se/1.3/docs/api"/>
-+          <link href="file:///usr/share/javadoc/java"/>
-       </javadoc>
-    </target>
- 
+Index: build.xml
+===================================================================
+--- build.xml.orig
++++ build.xml
+@@ -94,7 +94,7 @@
+                nonavbar="false"
+                serialwarn="false"
+                source="${javac.src.version}">
+-          <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
++          <link href="file://usr/share/javadoc/java"/>
+       </javadoc>
+    </target>
+ 
diff --git a/pom-maven2jpp-depcat.xsl b/pom-maven2jpp-depcat.xsl
deleted file mode 100644
index e1042c5..0000000
--- a/pom-maven2jpp-depcat.xsl
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/> 
- <xsl:strip-space elements="*"/> 
- <xsl:template match="*[name() != 'dependencies']|*/text()">
-     <xsl:apply-templates/>
- </xsl:template>
- <xsl:template match="//dependencies">
-  <xsl:for-each select="./dependency">
-   <xsl:element name="dependency">
-    <xsl:element name="maven">
-     <xsl:choose>
-      <xsl:when test="./groupId">
-       <xsl:copy-of select="./groupId"/>
-       <xsl:copy-of select="./artifactId"/>
-      </xsl:when>
-      <xsl:when test="./id">
-       <xsl:choose>
-        <xsl:when test="substring-before(./id/text(),':') != ''">
-         <xsl:element name="groupId">
-          <xsl:value-of select="substring-before(./id/text(),':')"/>
-         </xsl:element>
-         <xsl:element name="artifactId">
-          <xsl:value-of select="substring-after(./id/text(),':')"/>
-         </xsl:element>
-        </xsl:when>
-        <xsl:otherwise>
-         <xsl:element name="groupId">
-          <xsl:value-of select="./id/text()"/>
-         </xsl:element>
-         <xsl:element name="artifactId">
-          <xsl:value-of select="./id/text()"/>
-         </xsl:element>
-        </xsl:otherwise>
-       </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-ERROR
-      </xsl:otherwise>
-     </xsl:choose>
-     <xsl:for-each select="./*">
-      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
-       <xsl:copy-of select="."/>
-      </xsl:if>
-     </xsl:for-each>
-    </xsl:element>
-    <xsl:element name="jpp">
-     <xsl:element name="groupId">JPP</xsl:element>
-     <xsl:choose>
-      <xsl:when test="./artifactId">
-       <xsl:copy-of select="./artifactId"/>
-      </xsl:when>
-      <xsl:when test="./id">
-       <xsl:choose>
-        <xsl:when test="substring-after(./id/text(),':') != ''">
-         <xsl:element name="artifactId">
-          <xsl:value-of select="substring-after(./id/text(),':')"/>
-         </xsl:element>
-        </xsl:when>
-        <xsl:otherwise>
-         <xsl:element name="artifactId">
-          <xsl:value-of select="./id/text()"/>
-         </xsl:element>
-        </xsl:otherwise>
-       </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-ERROR
-      </xsl:otherwise>
-     </xsl:choose>
-     <xsl:element name="jar">
-      <xsl:choose>
-       <xsl:when test="./artifactId">
-        <xsl:value-of select="./artifactId/text()"/>
-       </xsl:when>
-       <xsl:when test="./id">
-        <xsl:choose>
-         <xsl:when test="substring-after(./id/text(),':') != ''">
-          <xsl:value-of select="substring-after(./id/text(),':')"/>
-         </xsl:when>
-         <xsl:otherwise>
-          <xsl:value-of select="./id/text()"/>
-         </xsl:otherwise>
-        </xsl:choose>
-       </xsl:when>
-       <xsl:otherwise>
-ERROR
-       </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-       <xsl:when test="./type">
-        <xsl:choose>
-         <xsl:when test="./type/text() = 'plugin'">.jar</xsl:when>
-         <xsl:otherwise>.<xsl:value-of select="./type/text()"/></xsl:otherwise>
-        </xsl:choose>
-       </xsl:when>
-       <xsl:otherwise>.jar</xsl:otherwise>
-      </xsl:choose>
-     </xsl:element>
-     <xsl:for-each select="./*">
-      <xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
-       <xsl:copy-of select="."/>
-      </xsl:if>
-     </xsl:for-each>
-    </xsl:element>
-   </xsl:element>
-  </xsl:for-each>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/pom-maven2jpp-mapdeps.xsl b/pom-maven2jpp-mapdeps.xsl
deleted file mode 100644
index d10cce7..0000000
--- a/pom-maven2jpp-mapdeps.xsl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:param name="map" /> 
- <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
- <xsl:strip-space elements="*"/> 
- <xsl:template match="/project" >
-  <xsl:element name="project">
-   <xsl:copy-of select="child::*[not(self::dependencies)]"/>
-   <xsl:if test="not(./dependencies)">
-    <xsl:element name="dependencies">
-     <xsl:for-each select="document($map)//add/dependency">
-       <xsl:copy-of select="."/>
-     </xsl:for-each>
-    </xsl:element>
-   </xsl:if>
-   <xsl:apply-templates select="dependencies"/>
-  </xsl:element>
- </xsl:template>
- <xsl:template match="dependencies" >
-  <xsl:element name="dependencies">
-   <xsl:for-each select="dependency">
-    <xsl:if test="./artifactId">
-     <xsl:call-template name="replace">
-      <xsl:with-param name="artifact" select="./artifactId/text()"/>
-     </xsl:call-template>
-    </xsl:if>
-    <xsl:if test="./id">
-     <xsl:choose>
-      <xsl:when test="substring-after(./id/text(),':') != ''">
-       <xsl:call-template name="replace">
-        <xsl:with-param name="artifact" select="substring-after(./id/text(),':')"/>
-       </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-       <xsl:call-template name="replace">
-        <xsl:with-param name="artifact" select="./id/text()"/>
-       </xsl:call-template>
-      </xsl:otherwise>
-     </xsl:choose>
-    </xsl:if>
-   </xsl:for-each>
-   <xsl:for-each select="document($map)//add/dependency">
-    <xsl:copy-of select="."/>
-   </xsl:for-each>
-  </xsl:element>
- </xsl:template>
- <xsl:template name="replace">
-  <xsl:param name="artifact"/>
-  <xsl:variable name="this" select="."/>
-   <xsl:choose>
-    <xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
-     <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
-      <xsl:if test="../jpp">
-       <xsl:element name="dependency">
-        <xsl:copy-of select="../jpp/*"/>
-        <xsl:copy-of select="$this/properties"/>
-       </xsl:element>
-      </xsl:if>
-     </xsl:for-each>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:element name="dependency">
-      <xsl:copy-of select="./*"/>
-     </xsl:element>
-    </xsl:otherwise>
-   </xsl:choose>
-  <xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
-   <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
-    <xsl:for-each select="../add/dependency">
-     <xsl:element name="dependency">
-      <xsl:copy-of select="./*"/>
-      <xsl:copy-of select="$this/properties"/>
-     </xsl:element>
-    </xsl:for-each>
-   </xsl:for-each>
-  </xsl:if>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/pom-maven2jpp-newdepmap.xsl b/pom-maven2jpp-newdepmap.xsl
deleted file mode 100644
index ea1dcd3..0000000
--- a/pom-maven2jpp-newdepmap.xsl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:saxon="http://icl.com/saxon"
-	extension-element-prefixes="saxon">
- <xsl:output method="xml" indent="yes" omit-xml-declaration="no"/> 
- <xsl:strip-space elements="*"/> 
- <xsl:template match="/" >
-  <xsl:element name="depset">
-   <saxon:group select="//dependency" group-by="./maven/artifactId">
-    <xsl:sort select="./maven/artifactId"/>
-    <xsl:element name="dependency">
-     <xsl:element name="maven">
-      <xsl:copy-of select="./maven/*[name() != 'properties']"/>
-     </xsl:element>
-     <xsl:element name="jpp">
-      <xsl:copy-of select="./jpp/*[name() != 'properties']"/>
-     </xsl:element>
-    </xsl:element>
-    <saxon:item/>
-   </saxon:group>
-  </xsl:element>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/pool-1.3-jpp-depmap.xml b/pool-1.3-jpp-depmap.xml
deleted file mode 100644
index fb5ddd2..0000000
--- a/pool-1.3-jpp-depmap.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<depset>
-   <dependency>
-      <maven>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-         <version>3.8.1</version>
-      </maven>
-      <jpp>
-         <groupId>JPP</groupId>
-         <artifactId>junit</artifactId>
-         <jar>junit.jar</jar>
-         <version>3.8.1</version>
-      </jpp>
-   </dependency>
-   <dependency>
-      <maven>
-         <groupId>maven</groupId>
-         <artifactId>maven-changes-plugin</artifactId>
-         <version>1.6</version>
-         <url>http://maven.apache.org/maven-1.x/plugins/changes/</url>
-         <type>plugin</type>
-      </maven>
-   </dependency>
-   <dependency>
-      <maven>
-         <groupId>maven</groupId>
-         <artifactId>maven-jdiff-plugin</artifactId>
-         <version>1.5</version>
-         <url>http://maven.apache.org/maven-1.x/plugins/jdiff/</url>
-         <type>plugin</type>
-      </maven>
-   </dependency>
-   <dependency>
-      <maven>
-         <groupId>maven</groupId>
-         <artifactId>maven-plugin-plugin</artifactId>
-         <version>1.7</version>
-         <url>http://maven.apache.org/maven-1.x/plugins/plugin/</url>
-         <type>plugin</type>
-      </maven>
-   </dependency>
-   <dependency>
-      <maven>
-         <groupId>maven</groupId>
-         <artifactId>maven-scm-plugin</artifactId>
-         <version>1.5</version>
-         <url>http://maven.apache.org/maven-1.x/plugins/scm/</url>
-         <type>plugin</type>
-      </maven>
-   </dependency>
-</depset>
diff --git a/pool-tomcat5-build.xml b/pool-tomcat5-build.xml
deleted file mode 100644
index 859feac..0000000
--- a/pool-tomcat5-build.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- $Id: build.xml,v 1.25 2004/05/20 16:30:30 dirkv Exp $ -->
-<project name="commons-pool-tomcat5" default="build" basedir=".">
-
-   <property name="tomcat-pool.home" value="pool-tomcat5"/>
-   <property name="commons-pool.home" value="."/>
-   <property name="tomcat-pool.jar" value="commons-pool-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-pool.home}"/>
-   </target>
-
-<target name="build">
-    <copy todir="${tomcat-pool.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-pool.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-pool.home}/src/java/org/apache/commons" >
-        <replacefilter token="org.apache.commons"
-            value="org.apache.tomcat.dbcp" />
-    </replace>
-    <mkdir dir="${tomcat-pool.home}/src/java/org/apache/tomcat/dbcp" />
-    <move todir="${tomcat-pool.home}/src/java/org/apache/tomcat/dbcp">
-        <fileset dir="${tomcat-pool.home}/src/java/org/apache/commons" />
-    </move>
-    <mkdir dir="${tomcat-pool.home}/classes"/>
-    <javac destdir="${tomcat-pool.home}/classes"
-           optimize="off"
-           debug="${compile.debug}"
-           deprecation="${compile.deprecation}"
-           source="${compile.source}"
-           sourcepath="${tomcat-pool.home}/src/java"
-           srcdir="${tomcat-pool.home}/src/java" >
-      <include name="**" />
-    </javac>
-    <jar destfile="${tomcat-pool.home}/${tomcat-pool.jar}"
-         index="true">
-       <fileset dir="${tomcat-pool.home}/classes">
-          <include name="**/*.class" />
-          <include name="**/*.properties" />
-       </fileset>
-    </jar>
-  </target>
-
-</project>
-