- update to 3.2.1

- rename to apache-commons-collections - deleted patches * jakarta-commons-collections-navigation.patch * jakarta-commons-collections-target15.patch - added patches * commons-collections-3.2-build_xml.patch - use newest add_maven_depmap from javapackages-tools - drop -tomcat5 subpackage OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=1
2013-09-05 12:28:54 +00:00 · 2013-09-05 12:28:54 +00:00 · 2609026af7
commit 2609026af7
8 changed files with 331 additions and 0 deletions
--- a/.gitattributes
+++ 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
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+.osc
--- a/apache-commons-collections.changes
+++ b/apache-commons-collections.changes
@ -0,0 +1,78 @@
+-------------------------------------------------------------------
+Thu Sep  5 11:58:13 UTC 2013 - mvyskocil@suse.com
+
+- update to 3.2.1
+- rename to apache-commons-collections
+- deleted patches
+  * jakarta-commons-collections-navigation.patch
+  * jakarta-commons-collections-target15.patch
+- added patches
+  * commons-collections-3.2-build_xml.patch
+- use newest add_maven_depmap from javapackages-tools
+- drop -tomcat5 subpackage
+
+-------------------------------------------------------------------
+Tue Nov 11 09:47:14 CET 2008 - mvyskocil@suse.cz
+
+- fix of bnc#441085: yast2-schema is missing on media (openSUSE-11. 1-DVD-ppc-Build0113)
+  - unittest disabled as it fails on ppc with openjdk b11
+
+-------------------------------------------------------------------
+Mon Aug 25 16:30:12 CEST 2008 - mvyskocil@suse.cz
+
+- target=1.5 source=1.5
+
+-------------------------------------------------------------------
+Thu Mar 13 11:19:36 CET 2008 - mvyskocil@suse.cz
+
+- merged with jpackage-1.7
+- update to 3.2
+- changes in BuildRequires:
+  - java2-devel-packages was substituded by java-devel
+  - added ant-junit
+  - maven build support and a maven specific BuildRequires
+- added maven pom files
+- provides and obsoletes contains a version
+- the gcj build support
+- new subpackages:
+  - jakarta-commons-collections-testframework
+  - jakarta-commons-collections-testframework-javadoc
+  - jakarta-commons-collections-tomcat5
+
+-------------------------------------------------------------------
+Mon Sep 25 11:37:13 CEST 2006 - skh@suse.de
+
+- don't use icecream
+- use source="1.4" and target="1.4" for build with java 1.5
+
+-------------------------------------------------------------------
+Wed Jan 25 21:46:36 CET 2006 - mls@suse.de
+
+- converted neededforbuild to BuildRequires
+
+-------------------------------------------------------------------
+Wed Jul 27 16:09:34 CEST 2005 - jsmeix@suse.de
+
+- Adjustments in the spec file.
+
+-------------------------------------------------------------------
+Mon Jul 18 16:03:12 CEST 2005 - jsmeix@suse.de
+
+- Current version 3.1 from JPackage.org
+
+-------------------------------------------------------------------
+Mon Feb 21 17:17:15 CET 2005 - skh@suse.de
+
+- update to version 3.1
+- don't use icecream
+
+-------------------------------------------------------------------
+Thu Sep 16 14:59:08 CEST 2004 - skh@suse.de
+
+- Fix prerequires of javadoc subpackage
+
+-------------------------------------------------------------------
+Thu Sep  2 17:46:58 CEST 2004 - skh@suse.de
+
+- Initial package created with version 2.1.1 (JPackage 1.5)
+
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@ -0,0 +1,174 @@
+#
+# spec file for package jakarta-commons-collections (Version 3.2)
+#
+# Copyright (c) 2008 SUSE LINUX Products 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 http://bugs.opensuse.org/
+#
+
+# norootforbuild
+# icecream 0
+
+%define base_name       collections
+%define short_name      commons-%{base_name}
+
+Name:           apache-commons-collections
+Version:        3.2.1
+Release:        0
+Summary:        Commons Collections Package
+License:        Apache-2.0
+Group:          Development/Libraries/Java
+Url:            http://commons.apache.org/%{base_name}/
+Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source1:        commons-collections-testframework.pom
+Patch0:         jakarta-commons-collections-javadoc-nonet.patch
+Patch1:         commons-collections-3.2-build_xml.patch
+
+BuildRequires:  apache-commons-parent
+BuildRequires:  ant
+BuildRequires:  ant-junit
+BuildRequires:  jpackage-utils >= 1.7.2
+#BuildRequires:  xml-commons-jaxp-1.3-apis
+BuildRequires:  java-devel
+BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+Provides:       %{short_name} = %{version}-%{release}
+Obsoletes:      %{short_name} = 3.2
+Provides:       jakarta-%{short_name} = %{version}-%{release}
+Obsoletes:      jakarta-%{short_name} = 3.2
+
+Requires(pre):     coreutils
+Requires(post):    jpackage-utils >= 1.7.2
+Requires(postun):  jpackage-utils >= 1.7.2
+
+%description
+The introduction of the Collections API by Sun in JDK 1.2
+has been a boon to quick and effective Java programming.
+Ready access to powerful data structures has accelerated
+development by reducing the need for custom container
+classes around each core object.  Most Java2 APIs are
+significantly easier to use because of the Collections API.
+However, there are certain holes left unfilled by Sun's
+implementations, and the Jakarta-Commons Collections
+Component strives to fulfill them. Among the features of
+this package are: - special-purpose implementations of
+Lists and Maps for fast access
+
+- adapter classes from Java1-style containers (arrays,
+  enumerations) to Java2-style collections
+
+- methods to test or create typical set theory properties
+  of collections such as union, intersection, and closure
+
+%package testframework
+License:        Apache-2.0
+Summary:        Test framework for %{name}
+Group:          Development/Libraries/Java
+Requires:       %{name} = %{version}-%{release}
+
+%description testframework
+%{summary}.
+
+%package javadoc
+License:        Apache-2.0
+Summary:        Javadoc for %{name}
+Group:          Development/Libraries/Java
+
+%description javadoc
+%{summary}.
+
+%package testframework-javadoc
+License:        Apache-2.0
+Summary:        Javadoc for %{name} testframework
+Group:          Development/Libraries/Java
+
+%description testframework-javadoc
+%{summary}.
+
+%prep
+%setup -q -n %{short_name}-%{version}-src
+# remove all binary libs
+find . -name "*.jar" -exec rm -f {} \;
+find . -name "*.class" -exec rm -f {} \;
+
+%patch0 -p1
+%patch1 -p0
+
+# Fix file eof
+%{__sed} -i 's/\r//' LICENSE.txt
+%{__sed} -i 's/\r//' PROPOSAL.html
+%{__sed} -i 's/\r//' RELEASE-NOTES.html
+%{__sed} -i 's/\r//' README.txt
+%{__sed} -i 's/\r//' NOTICE.txt
+
+# Substitute version into testframework pom
+cp -p %{SOURCE1} pom-testframework.xml
+sed -i 's/@VERSION@/%{version}/' pom-testframework.xml
+
+%build
+#FIXME: the test fails on x390!
+#java: pthread_mutex_lock.c:71: __pthread_mutex_lock: Assertion `mutex->__data.__owner == 0' failed.
+#ant -Djava.io.tmpdir=. test dist tf.javadoc
+#FIXME: the test fails on ppc with openjdk b11
+# See bnc#441085
+#ant -Djava.io.tmpdir=. dist tf.javadoc
+export CLASSPATH=$(build-classpath junit4)
+ant -Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src tf.javadoc
+
+%install
+# jars
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 build/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 644 build/%{short_name}-testframework-%{version}.jar %{buildroot}%{_javadir}/%{name}-testframework.jar
+(cd %{buildroot}%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
+
+# poms
+install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
+install -Dpm 644 pom-testframework.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}-testframework.pom
+%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}"
+%add_maven_depmap JPP-%{short_name}-testframework.pom %{short_name}-testframework.jar -f "testframework" -a "org.apache.commons:%{short_name}-testframework"
+
+# javadoc
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr build/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+# testframework-javadoc
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-testframework
+cp -pr build/docs/testframework/* %{buildroot}%{_javadocdir}/%{name}-testframework
+
+%files
+%defattr(0644,root,root,0755)
+%doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.html NOTICE.txt
+%{_javadir}/%{name}.jar
+%{_javadir}/%{short_name}.jar
+%{_mavenpomdir}/JPP-%{short_name}.pom
+%{_mavendepmapfragdir}/%{name}
+
+%files testframework
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}-testframework.jar
+%{_javadir}/%{short_name}-testframework.jar
+%{_mavenpomdir}/JPP-%{short_name}-testframework.pom
+%{_mavendepmapfragdir}/%{name}-testframework
+
+%files javadoc
+%defattr(0644,root,root,0755)
+%doc LICENSE.txt NOTICE.txt
+%{_javadocdir}/%{name}
+
+%files testframework-javadoc
+%defattr(0644,root,root,0755)
+%doc LICENSE.txt NOTICE.txt
+%{_javadocdir}/%{name}-testframework
+
+%changelog
--- a/commons-collections-3.2-build_xml.patch
+++ b/commons-collections-3.2-build_xml.patch
@ -0,0 +1,20 @@
+--- build.xml.orig	2008-11-29 21:16:01.000000000 +0200
+++ build.xml	2008-11-29 21:17:28.000000000 +0200
+@@ -286,7 +286,7 @@
+   <!-- Runs all tests -->
+   <target name="-test-all" depends="compile.tests" unless="testcase">
+     <mkdir dir="${build.test.reports}"/>
+-    <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
+    <junit printsummary="yes" haltonfailure="no" showoutput="yes">
+       <formatter type="brief" />
+       <classpath>
+         <pathelement location="${build.classes}"/>
+@@ -331,7 +331,7 @@
+   <target name="testjar"  depends="compile.tests,jar"
+           description="Run all unit test cases">
+     <echo message="Running collections tests against built jar ..."/>
+-    <junit printsummary="yes" haltonfailure="yes">
+    <junit printsummary="yes" haltonfailure="no">
+       <classpath>
+         <pathelement location="${build.jar.name}"/>
+         <pathelement location="${build.tests}"/>
--- a/commons-collections-3.2.1-src.tar.gz
+++ b/commons-collections-3.2.1-src.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d
+size 609930
--- a/commons-collections-testframework.pom
+++ b/commons-collections-testframework.pom
@ -0,0 +1,6 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>commons-collections</groupId>
+  <artifactId>commons-collections-testframework</artifactId>
+  <version>@VERSION@</version>
+</project>
--- a/jakarta-commons-collections-javadoc-nonet.patch
+++ b/jakarta-commons-collections-javadoc-nonet.patch
@ -0,0 +1,26 @@
+--- commons-collections-3.1/build.xml~	2004-06-23 00:17:14.000000000 +0100
+++ commons-collections-3.1/build.xml	2005-05-04 13:58:44.000000000 +0100
+@@ -80,7 +80,6 @@
+ 
+   <!-- Javadoc -->
+   <property name="javadoc.access"          value="protected"/>
+-  <property name="javadoc.links"           value="http://java.sun.com/j2se/1.3/docs/api/"/>
+ 
+   <!-- JUnit -->
+   <property name="test.failonerror"        value="true"/>
+@@ -362,7 +361,6 @@
+                  author="true"
+                 version="true"
+                     use="true"
+-                   link="${javadoc.links}"
+                overview="${source.java}/org/apache/commons/collections/overview.html"
+                doctitle="${component.title} ${component.version} API;"
+             windowtitle="${component.title} ${component.version} API"
+@@ -470,7 +468,6 @@
+                  access="protected"
+                  author="false"
+                 version="false"
+-                   link="${javadoc.links}"
+                overview="${source.test}/org/apache/commons/collections/overview.html"
+                doctitle="${tf.title} ${tf.version} API;"
+             windowtitle="${tf.title} ${tf.version} API"