Fridrich Strba 2019-02-25 12:41:57 +00:00 committed by Git OBS Bridge
commit 8eebfaf420
7 changed files with 168 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -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

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

View File

@ -0,0 +1,92 @@
#
# spec file for package apache-commons-collections4
#
# 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 collections4
%define short_name commons-%{base_name}
%bcond_with tests
Name: apache-%{short_name}
Version: 4.1
Release: 0
Summary: Extension of the Java Collections Framework
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://commons.apache.org/proper/commons-collections/
Source0: http://archive.apache.org/dist/commons/collections/source/commons-collections4-%{version}-src.tar.gz
Patch0: commons-collections4-4.1-jdk11.patch
Patch1: commons-collections4-4.1-bundle.patch
Patch2: commons-collections4-4.1-javadoc.patch
BuildRequires: fdupes ant
BuildRequires: javapackages-local
BuildArch: noarch
%if %{with tests}
BuildRequires: easymock ant-junit
%endif
%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
%patch0 -p1
%patch1 -p1
%patch2 -p1
%pom_remove_parent
%build
%ant \
%if %{with tests}
-Djunit.jar=$(build-classpath junit) \
-Dhamcrest.jar=$(build-classpath hamcrest/core) \
-Deasymock.jar=$(build-classpath easymock) \
test \
%endif
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}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/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

View File

@ -0,0 +1,19 @@
--- commons-collections4-4.1-src/build.xml 2019-02-25 13:03:20.651249023 +0100
+++ commons-collections4-4.1-src/build.xml 2019-02-25 13:11:55.393720267 +0100
@@ -146,6 +146,16 @@
<attribute name="Implementation-Vendor-Id" value="org.apache"/>
<attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
<attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
+ <attribute name="Bundle-Description" value="The Apache Commons Collections package contains types that extend and augment the Java Collections Framework."/>
+ <attribute name="Bundle-DocURL" value="http://commons.apache.org/proper/commons-collections/"/>
+ <attribute name="Bundle-License" value="https://www.apache.org/licenses/LICENSE-2.0.txt"/>
+ <attribute name="Bundle-ManifestVersion" value="2"/>
+ <attribute name="Bundle-Name" value="Commons Collections"/>
+ <attribute name="Bundle-SymbolicName" value="org.apache.commons.${component.name}"/>
+ <attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
+ <attribute name="Bundle-Version" value="4.1.0"/>
+ <attribute name="Export-Package" value="org.apache.commons.collections4;version=&quot;${component.version}&quot;,org.apache.commons.collections4.bag;version=&quot;${component.version}&quot;,org.apache.commons.collections4.bidimap;version=&quot;${component.version}&quot;,org.apache.commons.collections4.collection;version=&quot;${component.version}&quot;,org.apache.commons.collections4.comparators;version=&quot;${component.version}&quot;,org.apache.commons.collections4.functors;version=&quot;${component.version}&quot;,org.apache.commons.collections4.iterators;version=&quot;${component.version}&quot;,org.apache.commons.collections4.keyvalue;version=&quot;${component.version}&quot;,org.apache.commons.collections4.list;version=&quot;${component.version}&quot;,org.apache.commons.collections4.map;version=&quot;${component.version}&quot;,org.apache.commons.collections4.multimap;version=&quot;${component.version}&quot;,org.apache.commons.collections4.multiset;version=&quot;${component.version}&quot;,org.apache.commons.collections4.queue;version=&quot;${component.version}&quot;,org.apache.commons.collections4.sequence;version=&quot;${component.version}&quot;,org.apache.commons.collections4.set;version=&quot;${component.version}&quot;,org.apache.commons.collections4.splitmap;version=&quot;${component.version}&quot;,org.apache.commons.collections4.trie;version=&quot;${component.version}&quot;,org.apache.commons.collections4.trie.analyzer;version=&quot;${component.version}&quot;"/>
+ <attribute name="Import-Package" value="org.w3c.dom"/>
</manifest>
<fileset dir="${build.home}/classes">
<include name="**/*.class"/>

View File

@ -0,0 +1,19 @@
--- commons-collections4-4.1-src/build.xml 2015-11-25 22:52:41.000000000 +0100
+++ commons-collections4-4.1-src/build.xml 2019-02-25 13:29:35.562798645 +0100
@@ -29,7 +29,6 @@
<property file="${user.home}/build.properties"/>
<property file="${basedir}/build.properties"/>
<property file="${basedir}/default.properties"/>
- <property name="jdk.javadoc" value="http://download.oracle.com/javase/1.5.0/docs/api/"/>
<!-- ========== Construct compile classpath =============================== -->
<path id="compile.classpath">
@@ -125,8 +124,6 @@
encoding="${compile.encoding}"
source="${compile.source}">
<classpath refid="compile.classpath"/>
- <link href="${jdk.javadoc}"/>
- <link href="${collections.javadoc}"/>
</javadoc>
</target>

View File

@ -0,0 +1,11 @@
--- commons-collections4-4.1-src/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java 2015-11-25 22:52:42.000000000 +0100
+++ commons-collections4-4.1-src/src/test/java/org/apache/commons/collections4/collection/AbstractCollectionTest.java 2018-11-19 09:48:39.052536491 +0100
@@ -1085,7 +1085,7 @@
verify();
try {
- array = getCollection().toArray(null);
+ array = getCollection().toArray((Object[])null);
fail("toArray(null) should raise NPE");
} catch (final NullPointerException e) {
// expected

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:94839a0620a0fb1999aa94d490cd8d6919f79dc206be33b722f856ffde862ecf
size 704671