[packages/java-commons-collections] Up to 4.4
arekm
arekm at pld-linux.org
Sat Apr 4 17:34:33 CEST 2026
commit 29e49f93463c31d5e8cfddc6ab2fafb308e8700a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Apr 4 15:39:41 2026 +0200
Up to 4.4
jakarta-commons-collections-target.patch | 29 --------
jakarta-commons-collections-tomcat5-build.xml | 70 -------------------
java-commons-collections.spec | 97 +++++++++++++--------------
3 files changed, 47 insertions(+), 149 deletions(-)
---
diff --git a/java-commons-collections.spec b/java-commons-collections.spec
index 0a5047f..7d71a61 100644
--- a/java-commons-collections.spec
+++ b/java-commons-collections.spec
@@ -2,57 +2,43 @@
# Conditional build:
%bcond_without javadoc # don't build javadoc
-%define srcname commons-collections
+%{?use_default_jdk:%use_default_jdk 8}
+
+%define srcname commons-collections4
Summary: Commons Collections - Java Collections enhancements
Summary(pl.UTF-8): Commons Collections - rozszerzenia Java Collections
Name: java-commons-collections
-Version: 3.2.1
-Release: 2
+Version: 4.4
+Release: 1
License: Apache v2.0
Group: Libraries/Java
-Source0: http://www.apache.org/dist/commons/collections/source/commons-collections-%{version}-src.tar.gz
-# Source0-md5: 031ce05872ddb0462f0dcce1e5babbe9
-Source1: jakarta-commons-collections-tomcat5-build.xml
-Patch0: jakarta-commons-collections-target.patch
-URL: http://commons.apache.org/collections/
-BuildRequires: ant
-BuildRequires: jdk
+Source0: https://archive.apache.org/dist/commons/collections/source/%{srcname}-%{version}-src.tar.gz
+# Source0-md5: 5a4bc1a9b8fd65708057ea50dfc1e74a
+URL: https://commons.apache.org/proper/commons-collections/
+%buildrequires_jdk
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
-BuildRequires: rpmbuild(macros) >= 1.300
-BuildRequires: sed >= 4.0
-Obsoletes: jakarta-commons-collections
+BuildRequires: rpmbuild(macros) >= 1.556
+Obsoletes: jakarta-commons-collections < 3.2.1
+Obsoletes: java-commons-collections-tomcat5 < 4
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-The Collections package contains a set of Java classes that extend or
-augment the Java Collections Framework.
+The Commons Collections package contains a set of Java classes that
+extend or augment the Java Collections Framework.
%description -l pl.UTF-8
-Pakiet Collections zawiera zestaw klas Javy rozszerzających lub
-powiększających szkielet Java Collections.
-
-%package tomcat5
-Summary: Commons Collections dependency for Tomcat5
-Summary(pl.UTF-8): Elementy Commons Collections dla Tomcata 5
-Group: Libraries/Java
-Obsoletes: jakarta-commons-collections-source
-Obsoletes: jakarta-commons-collections-tomcat5
-
-%description tomcat5
-Commons Collections dependency for Tomcat5.
-
-%description tomcat5 -l pl.UTF-8
-Elementy Commons Collections dla Tomcata 5.
+Pakiet Commons Collections zawiera zestaw klas Javy rozszerzających
+lub powiększających szkielet Java Collections.
%package javadoc
Summary: Commons Collections documentation
Summary(pl.UTF-8): Dokumentacja do Commons Collections
Group: Documentation
Requires: jpackage-utils
-Obsoletes: jakarta-commons-collections-doc
-Obsoletes: jakarta-commons-collections-javadoc
+Obsoletes: jakarta-commons-collections-doc < 3.2.1
+Obsoletes: jakarta-commons-collections-javadoc < 3.2.1
%description javadoc
Commons Collections documentation.
@@ -61,32 +47,45 @@ Commons Collections documentation.
Dokumentacja do Commons Collections.
%prep
-%setup -q -n commons-collections-%{version}-src
-%{__sed} -i -e 's,\r$,,' build.xml
-%patch -P0 -p1
-cp %{SOURCE1} tomcat5-build.xml
+%setup -q -n %{srcname}-%{version}-src
find -name '*.jar' | xargs rm -vf
%build
-%ant jar %{?with_javadoc:javadoc}
+export JAVA_HOME="%{java_home}"
+
+install -d target/classes
+%javac -d target/classes \
+ -source 1.8 -target 1.8 \
+ -encoding UTF-8 \
+ $(find src/main/java -name '*.java')
+
+cd target/classes
+%jar cf ../%{srcname}-%{version}.jar org
+cd ../..
-# commons-collections-tomcat5
-%ant -f tomcat5-build.xml
+%if %{with javadoc}
+%javadoc -d target/apidocs \
+ -source 1.8 \
+ -encoding UTF-8 \
+ -Xdoclint:none \
+ -subpackages org.apache.commons.collections4 \
+ -sourcepath src/main/java
+%endif
%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d $RPM_BUILD_ROOT%{_javadir}
-install build/%{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+install target/%{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
ln -sf %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
-
-install collections-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
+# compat symlinks for packages expecting old names
+ln -sf %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-collections-%{version}.jar
+ln -sf %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-collections.jar
# javadoc
%if %{with javadoc}
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-cp -a build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a target/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
%endif
@@ -98,13 +97,11 @@ ln -sf %{srcname}-%{version} %{_javadocdir}/%{srcname}
%files
%defattr(644,root,root,755)
-%{_javadir}/%{srcname}.jar
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
%{_javadir}/%{srcname}-%{version}.jar
-
-%files tomcat5
-%defattr(644,root,root,755)
-%{_javadir}/%{srcname}-tomcat5.jar
-%{_javadir}/%{srcname}-tomcat5-%{version}.jar
+%{_javadir}/%{srcname}.jar
+%{_javadir}/commons-collections-%{version}.jar
+%{_javadir}/commons-collections.jar
%if %{with javadoc}
%files javadoc
diff --git a/jakarta-commons-collections-target.patch b/jakarta-commons-collections-target.patch
deleted file mode 100644
index 385341e..0000000
--- a/jakarta-commons-collections-target.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- commons-collections-3.1/build.xml~ 2004-06-23 02:17:14.000000000 +0300
-+++ commons-collections-3.1/build.xml 2007-12-02 23:42:09.251354528 +0200
-@@ -118,6 +118,8 @@
- destdir="${build.classes}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
-+ source="1.3"
-+ target="1.3"
- optimize="${compile.optimize}">
- </javac>
- </target>
-@@ -290,6 +292,8 @@
- destdir="${build.tests}"
- debug="true"
- deprecation="false"
-+ source="1.3"
-+ target="1.3"
- optimize="false">
- <classpath>
- <pathelement location="${build.classes}"/>
-@@ -414,6 +418,8 @@
- destdir="${tf.build.tf}"
- debug="true"
- deprecation="false"
-+ source="1.3"
-+ target="1.3"
- optimize="false">
- <patternset refid="tf.patternset.validate" />
- <classpath>
diff --git a/jakarta-commons-collections-tomcat5-build.xml b/jakarta-commons-collections-tomcat5-build.xml
deleted file mode 100644
index 7091724..0000000
--- a/jakarta-commons-collections-tomcat5-build.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<project name="commons-collections-tomcat5" default="build" basedir=".">
-
- <property name="tomcat-collections.home" value="collections-tomcat5"/>
- <property name="commons-collections.home" value="."/>
- <property name="tomcat-collections.jar" value="commons-collections-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-collections.home}"/>
- </target>
-
-<target name="build">
- <copy todir="${tomcat-collections.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-collections.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-collections.home}/src/java/org/apache/commons" >
- <replacefilter token="org.apache.commons"
- value="org.apache.tomcat.dbcp" />
- </replace>
- <mkdir dir="${tomcat-collections.home}/src/java/org/apache/tomcat/dbcp" />
- <move todir="${tomcat-collections.home}/src/java/org/apache/tomcat/dbcp">
- <fileset dir="${tomcat-collections.home}/src/java/org/apache/commons" />
- </move>
- <mkdir dir="${tomcat-collections.home}/classes"/>
- <javac destdir="${tomcat-collections.home}/classes"
- optimize="off"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- sourcepath="${tomcat-collections.home}/src/java"
- srcdir="${tomcat-collections.home}/src/java" >
- <include name="**" />
- </javac>
- <jar destfile="${tomcat-collections.home}/${tomcat-collections.jar}"
- index="true">
- <fileset dir="${tomcat-collections.home}/classes">
- <include name="**/*.class" />
- <include name="**/*.properties" />
- </fileset>
- </jar>
- </target>
-
-</project>
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/java-commons-collections.git/commitdiff/29e49f93463c31d5e8cfddc6ab2fafb308e8700a
More information about the pld-cvs-commit
mailing list