From 7b1b54954ab95e7a47dc693ec0985fb735537eb2fcf18ab4b4f10d520becdd34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 10:58:39 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main apache-commons-collections4 revision 4e51b25dadbf2731a732c178eef40400 --- .gitattributes | 23 +++++ apache-commons-collections4-build.xml | 142 ++++++++++++++++++++++++++ apache-commons-collections4.changes | 34 ++++++ apache-commons-collections4.spec | 78 ++++++++++++++ commons-collections4-4.4-src.tar.gz | 3 + 5 files changed, 280 insertions(+) create mode 100644 .gitattributes create mode 100644 apache-commons-collections4-build.xml create mode 100644 apache-commons-collections4.changes create mode 100644 apache-commons-collections4.spec create mode 100644 commons-collections4-4.4-src.tar.gz 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-collections4-build.xml b/apache-commons-collections4-build.xml new file mode 100644 index 0000000..b5b0cd2 --- /dev/null +++ b/apache-commons-collections4-build.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apache-commons-collections4.changes b/apache-commons-collections4.changes new file mode 100644 index 0000000..160feff --- /dev/null +++ b/apache-commons-collections4.changes @@ -0,0 +1,34 @@ +------------------------------------------------------------------- +Wed Oct 25 14:24:18 UTC 2023 - Fridrich Strba + +- Update to upstream version 4.4 + * Changes + + Updates the platform requirement from Java 6 to 8 + + Add Automatic-Module-Name MANIFEST entry for Java 9 + compatibility + + Added a few new APIs. + * Builds with java 21 out of the box + * Generated ant build system with maven-ant-plugin in order to + build with ant like before. +- Removed patches: + * commons-collections4-4.1-bundle.patch + * commons-collections4-4.1-javadoc.patch + * commons-collections4-4.1-jdk11.patch + + All changes factored into the generated build.xml + +------------------------------------------------------------------- +Fri Mar 18 18:14:43 UTC 2022 - Fridrich Strba + +- Build with source/target levels 8 + +------------------------------------------------------------------- +Mon Mar 4 10:41:43 UTC 2019 - Fridrich Strba + +- Initial packaging of apache-commons-collections4 4.1 +- Added patches: + * commons-collections4-4.1-bundle.patch + + Add to the manifest OSGi bundle information + * commons-collections4-4.1-javadoc.patch + + Do not try to download web-based resources during the build. + * commons-collections4-4.1-jdk11.patch + + Resolve type ambiguity in a toArray(null) call diff --git a/apache-commons-collections4.spec b/apache-commons-collections4.spec new file mode 100644 index 0000000..64761ac --- /dev/null +++ b/apache-commons-collections4.spec @@ -0,0 +1,78 @@ +# +# spec file +# +# Copyright (c) 2023 SUSE LLC +# +# 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 collections4 +%define short_name commons-%{base_name} +%bcond_with tests +Name: apache-%{short_name} +Version: 4.4 +Release: 0 +Summary: Extension of the Java Collections Framework +License: Apache-2.0 +Group: Development/Libraries/Java +URL: https://commons.apache.org/proper/commons-collections/ +Source0: http://archive.apache.org/dist/commons/collections/source/commons-collections4-%{version}-src.tar.gz +Source1: %{name}-build.xml +BuildRequires: ant +BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local >= 6 +BuildArch: noarch + +%description +Commons-Collections seek to build upon the JDK classes by providing +new interfaces, implementations and utilities. + +%package javadoc +Summary: API documentation for %{name} +Group: Documentation/HTML + +%description javadoc +This package provides %{summary}. + +%prep +%setup -q -n commons-collections4-%{version}-src +cp %{SOURCE1} build.xml + +%build +%{ant} jar javadoc + +%install +# jar +install -dm 0755 %{buildroot}%{_javadir} +install -pm 0644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir} +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%doc RELEASE-NOTES.txt +%license LICENSE.txt NOTICE.txt +%{_javadir}/%{short_name}.jar + +%files javadoc +%license LICENSE.txt NOTICE.txt +%{_javadocdir}/%{name} + +%changelog diff --git a/commons-collections4-4.4-src.tar.gz b/commons-collections4-4.4-src.tar.gz new file mode 100644 index 0000000..0f19459 --- /dev/null +++ b/commons-collections4-4.4-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2af935fa71a47c3bcd43ae8fb49526ca2035ae027bfeb758d16fee2d8b010a60 +size 703008