[packages/java-commons-pool] Up to 1.6
arekm
arekm at pld-linux.org
Sat Apr 4 20:09:40 CEST 2026
commit 46e2720fd420b3742241614dee871df00fb3636f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Apr 4 20:09:21 2026 +0200
Up to 1.6
jakarta-commons-pool-tomcat5-build.xml | 71 ----------------------------------
java-commons-pool.spec | 59 ++++++++--------------------
2 files changed, 17 insertions(+), 113 deletions(-)
---
diff --git a/java-commons-pool.spec b/java-commons-pool.spec
index bb7652b..02c0b98 100644
--- a/java-commons-pool.spec
+++ b/java-commons-pool.spec
@@ -2,27 +2,27 @@
# Conditional build:
%bcond_with javadoc # don't build javadoc
+%{?use_default_jdk:%use_default_jdk 8}
+
%define srcname commons-pool
Summary: Commons Pool - object pooling interfaces
Summary(pl.UTF-8): Commons Pool - interfejsy gospodarujące obiektami
Name: java-commons-pool
-Version: 1.5.7
-Release: 2
-License: Apache
+Version: 1.6
+Release: 1
+License: Apache v2.0
Group: Libraries/Java
-Source0: http://www.apache.org/dist/commons/pool/source/commons-pool-%{version}-src.tar.gz
-# Source0-md5: fcec4e996efda82ec8643dd2aeb63c7c
-Source1: jakarta-commons-pool-tomcat5-build.xml
-URL: http://commons.apache.org/pool/
+Source0: https://archive.apache.org/dist/commons/pool/source/commons-pool-%{version}-src.tar.gz
+# Source0-md5: ef08ea62cad838d4149e40b1eae06d9a
+URL: https://commons.apache.org/pool/
BuildRequires: ant
-BuildRequires: java-commons-collections >= 1.0
-BuildRequires: jdk
+%buildrequires_jdk
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
-BuildRequires: rpmbuild(macros) >= 1.300
-Requires: java-commons-collections >= 1.0
+BuildRequires: rpmbuild(macros) >= 1.556
Requires: jpackage-utils
-Obsoletes: jakarta-commons-pool
+Obsoletes: jakarta-commons-pool < 1.6
+Obsoletes: java-commons-pool-tomcat5 < 1.6
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,8 +38,8 @@ oraz dostarcza kilku implementacji ogólnego przeznaczenia.
Summary: Commons Pool documentation
Summary(pl.UTF-8): Dokumentacja do Commons Pool
Group: Documentation
-Obsoletes: jakarta-commons-pool-doc
-Obsoletes: jakarta-commons-pool-javadoc
+Obsoletes: jakarta-commons-pool-doc < 1.6
+Obsoletes: jakarta-commons-pool-javadoc < 1.6
%description javadoc
Commons Pool documentation.
@@ -47,29 +47,12 @@ Commons Pool documentation.
%description javadoc -l pl.UTF-8
Dokumentacja do Commons Pool.
-%package tomcat5
-Summary: Commons Pool dependency for Tomcat5
-Summary(pl.UTF-8): Elementy Commons Pool dla Tomcata 5
-Group: Development/Languages/Java
-Obsoletes: jakarta-commons-pool-source
-Obsoletes: jakarta-commons-pool-tomcat5
-
-%description tomcat5
-Commons Pool dependency for Tomcat5.
-
-%description tomcat5 -l pl.UTF-8
-Elementy Commons Pool dla Tomcata 5.
-
%prep
%setup -q -n commons-pool-%{version}-src
-cp -p %{SOURCE1} tomcat5-build.xml
%build
-required_jars="commons-collections"
-export CLASSPATH=$(build-classpath $required_jars)
-%ant clean
-%ant build-jar %{?with_javadoc:javadoc}
-%ant -f tomcat5-build.xml
+%ant -Dversion=%{version} clean
+%ant -Dversion=%{version} build-jar %{?with_javadoc:javadoc}
%install
rm -rf $RPM_BUILD_ROOT
@@ -77,14 +60,11 @@ install -d $RPM_BUILD_ROOT%{_javadir}
cp -a dist/%{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
-cp -a pool-tomcat5/%{srcname}-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-tomcat5-%{version}.jar
-ln -sf %{srcname}-tomcat5-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-tomcat5.jar
-
# javadoc
%if %{with javadoc}
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
%endif
%clean
@@ -99,11 +79,6 @@ ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
%{_javadir}/%{srcname}.jar
%{_javadir}/%{srcname}-%{version}.jar
-%files tomcat5
-%defattr(644,root,root,755)
-%{_javadir}/%{srcname}-tomcat5.jar
-%{_javadir}/%{srcname}-tomcat5-%{version}.jar
-
%if %{with javadoc}
%files javadoc
%defattr(644,root,root,755)
diff --git a/jakarta-commons-pool-tomcat5-build.xml b/jakarta-commons-pool-tomcat5-build.xml
deleted file mode 100644
index 6ed8555..0000000
--- a/jakarta-commons-pool-tomcat5-build.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!-- $Id$ -->
-<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>
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/java-commons-pool.git/commitdiff/46e2720fd420b3742241614dee871df00fb3636f
More information about the pld-cvs-commit
mailing list