From 3dde3b3a93129c6a9669b5ac0025de6345dc438a15990610d9b181e183baf45f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 11:02:43 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main apache-commons-pool2 revision 9e8ceafff258b76cae27655da012647e --- .gitattributes | 23 +++++++ apache-commons-pool2.changes | 90 +++++++++++++++++++++++++ apache-commons-pool2.spec | 109 +++++++++++++++++++++++++++++++ commons-pool2-2.4.2-src.tar.gz | 3 + jakarta-commons-pool-build.patch | 20 ++++++ 5 files changed, 245 insertions(+) create mode 100644 .gitattributes create mode 100644 apache-commons-pool2.changes create mode 100644 apache-commons-pool2.spec create mode 100644 commons-pool2-2.4.2-src.tar.gz create mode 100644 jakarta-commons-pool-build.patch diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/apache-commons-pool2.changes b/apache-commons-pool2.changes new file mode 100644 index 0000000..bee0a34 --- /dev/null +++ b/apache-commons-pool2.changes @@ -0,0 +1,90 @@ +------------------------------------------------------------------- +Mon Mar 25 17:47:40 UTC 2019 - Fridrich Strba + +- Remove pom parent, since we don't use it when not building with + maven + +------------------------------------------------------------------- +Thu Dec 13 11:27:43 UTC 2018 - Fridrich Strba + +- Add maven pom file + +------------------------------------------------------------------- +Tue May 15 13:19:59 UTC 2018 - fstrba@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility +- Run fdupes on documentation + +------------------------------------------------------------------- +Thu Sep 14 14:55:25 UTC 2017 - fstrba@suse.com + +- Fix javadoc build + +------------------------------------------------------------------- +Thu Sep 29 11:24:32 UTC 2016 - tchvatal@suse.com + +- Version update to 2.4.2 release from pool2: + * rename to latest 2.x pool series for dbcp and other packages + +------------------------------------------------------------------- +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 + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- +Thu Mar 13 17:07:19 CET 2008 - mvyskocil@suse.cz + +- merged with jpackage 1.7 +- update to 1.3 +- changes in BuildRequires: + - java2-deve-packages was substituded by java-devel + - added a junit + - added a maven build support and maven related BuildRequires + - xml-commons-apis was moved to the maven build branch +- added a gcj build support +- included a maven depmap files +- remove a source=1.4 from build and a java14compat patch +- provides and obsoletes of main package contains the version +- new tomcat5 subpackage +- new manual subpackage (build only with maven) + +------------------------------------------------------------------- +Fri Sep 15 15:05:27 CEST 2006 - ro@suse.de + +- set source=1.4 for java + +------------------------------------------------------------------- +Wed Jan 25 21:46:38 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Thu Jul 28 13:53:21 CEST 2005 - jsmeix@suse.de + +- Adjustments in the spec file. + +------------------------------------------------------------------- +Mon Jul 18 16:28:18 CEST 2005 - jsmeix@suse.de + +- Current version 1.2 from JPackage.org + +------------------------------------------------------------------- +Thu Sep 16 15:49:57 CEST 2004 - skh@suse.de + +- Fix prerequires of javadoc subpackage + +------------------------------------------------------------------- +Thu Sep 2 18:58:54 CEST 2004 - skh@suse.de + +- Initial package created with version 1.2 (JPackage 1.5) + diff --git a/apache-commons-pool2.spec b/apache-commons-pool2.spec new file mode 100644 index 0000000..ff6fd3d --- /dev/null +++ b/apache-commons-pool2.spec @@ -0,0 +1,109 @@ +# +# spec file for package apache-commons-pool2 +# +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define base_name pool +%define short_name commons-%{base_name}2 +Name: apache-commons-pool2 +Version: 2.4.2 +Release: 0 +Summary: Apache Commons Pool 2.x series +License: Apache-2.0 +Group: Development/Libraries/Java +URL: https://commons.apache.org/proper/commons-pool/ +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: cglib +BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local +BuildRequires: junit +Requires: cglib +Provides: %{short_name} = %{version} +Obsoletes: %{short_name} < %{version} +BuildArch: noarch + +%description +The goal of the Pool 2.x 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. + +%package javadoc +Summary: Javadoc for %{name} +Group: Development/Libraries/Java + +%description javadoc +The goal of Pool 2.x package it to create and maintain an object (instance) +pooling package to be distributed under the ASF license. The package +should support a variety of pool implementations, but encourage support +of an interface that makes these implementations interchangeable. + +This package contains the javadoc documentation for the Apache Commons +Pool 2.x Package. + +%prep +%setup -q -n %{short_name}-%{version}-src +# remove all binary libs +find . -name "*.jar" -exec rm -f {} \; +%patch0 + +%pom_remove_parent . +%pom_xpath_inject "pom:project" "org.apache.commons" . + +%build +echo "cglib.jar=$(build-classpath cglib)" >> build.properties +ant \ + -Djavac.target.version=8 -Djavac.src.version=8 \ + -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 +(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) +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom +%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar + +# javadoc +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} + +%files +%license LICENSE.txt +%doc README.txt +%{_javadir}/%{name}.jar +%{_javadir}/%{name}-%{version}.jar +%{_javadir}/%{short_name}.jar +%{_javadir}/%{short_name}-%{version}.jar +%{_mavenpomdir}/%{name}-%{version}.pom +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name} +%else +%{_datadir}/maven-metadata/%{name}.xml* +%endif + +%files javadoc +%doc %{_javadocdir}/%{name} + +%changelog diff --git a/commons-pool2-2.4.2-src.tar.gz b/commons-pool2-2.4.2-src.tar.gz new file mode 100644 index 0000000..098ac07 --- /dev/null +++ b/commons-pool2-2.4.2-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e08a0cf4854ff745b99f7ab0ec43f918ae4b8aad35f6f10d9a27ed9129c0b86 +size 179077 diff --git a/jakarta-commons-pool-build.patch b/jakarta-commons-pool-build.patch new file mode 100644 index 0000000..2bbd443 --- /dev/null +++ b/jakarta-commons-pool-build.patch @@ -0,0 +1,20 @@ +Index: build.xml +=================================================================== +--- build.xml.orig ++++ build.xml +@@ -97,7 +97,7 @@ + nonavbar="false" + serialwarn="false" + source="${javac.src.version}"> +- ++ + + + +@@ -211,4 +211,4 @@ + + + +- +\ No newline at end of file ++