[packages/java-commons-beanutils] Up to 1.11.0
arekm
arekm at pld-linux.org
Sat Apr 4 20:19:56 CEST 2026
commit 1e17a449cc8ed54d22a0a2018793c90b4fba8164
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Apr 4 20:19:27 2026 +0200
Up to 1.11.0
jakarta-commons-beanutils-target.patch | 30 -------------------------
java-commons-beanutils-build.patch | 38 +++++++++++++++++++++++++++++++
java-commons-beanutils.spec | 41 +++++++++++++++++-----------------
3 files changed, 58 insertions(+), 51 deletions(-)
---
diff --git a/java-commons-beanutils.spec b/java-commons-beanutils.spec
index 2be14d0..a522fe2 100644
--- a/java-commons-beanutils.spec
+++ b/java-commons-beanutils.spec
@@ -2,25 +2,27 @@
# Conditional build:
%bcond_without javadoc # don't build javadoc
#
+%{?use_default_jdk:%use_default_jdk 8}
+
%define srcname commons-beanutils
Summary: Commons BeanUtils - Bean Introspection Utilities
Summary(pl.UTF-8): Commons BeanUtils - narzędzia do badania JavaBeans
Name: java-commons-beanutils
-Version: 1.7.0
-Release: 4
+Version: 1.11.0
+Release: 1
License: Apache v2.0
Group: Libraries/Java
-Source0: http://www.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz
-# Source0-md5: 3fd5cbdf70363b151de5cd538f726e67
-Patch0: jakarta-commons-beanutils-target.patch
-URL: http://commons.apache.org/beanutils/
+Source0: https://archive.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz
+# Source0-md5: af955567d37c0b01d22ea7bde76d990b
+Patch0: java-commons-beanutils-build.patch
+URL: https://commons.apache.org/beanutils/
BuildRequires: java-commons-collections
BuildRequires: java-commons-logging
-BuildRequires: jdk
+%buildrequires_jdk
BuildRequires: jpackage-utils
-BuildRequires: junit
+BuildRequires: java-junit
BuildRequires: rpm-javaprov
-BuildRequires: rpmbuild(macros) >= 1.300
+BuildRequires: rpmbuild(macros) >= 1.556
Suggests: java-commons-collections
Provides: jakarta-commons-beanutils
Obsoletes: jakarta-commons-beanutils
@@ -59,27 +61,24 @@ Dokumentacja do Commons BeanUtils.
%patch -P0 -p1
%build
-required_jars="commons-logging commons-collections"
-export CLASSPATH=$(build-classpath $required_jars)
-export LC_ALL=en_US # sources are not in ASCII
-%ant clean
-%ant jar bean-collections-dist %{?with_javadoc:javadoc}
+%ant \
+ -Dcomponent.version=%{version} \
+ -Dcommons-logging.jar=$(build-classpath commons-logging) \
+ -Dcommons-collections.jar=$(build-classpath commons-collections) \
+ jar %{?with_javadoc:javadoc}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_javadir}
# jars
-cp -a dist/%{srcname}-core.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-core-%{version}.jar
-ln -s %{srcname}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-core.jar
-
-cp -a optional/bean-collections/dist/%{srcname}-bean-collections.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-bean-collections-%{version}.jar
-ln -s %{srcname}-bean-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-bean-collections.jar
+cp -a dist/%{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
# javadoc
%if %{with javadoc}
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-cp -a dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
%endif
@@ -91,7 +90,7 @@ ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
%files
%defattr(644,root,root,755)
-%doc *.txt
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
%{_javadir}/*.jar
%if %{with javadoc}
diff --git a/jakarta-commons-beanutils-target.patch b/jakarta-commons-beanutils-target.patch
deleted file mode 100644
index 063b906..0000000
--- a/jakarta-commons-beanutils-target.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- commons-beanutils-1.7.0-src/build.xml 2004-07-28 00:59:14.000000000 +0300
-+++ commons-beanutils-1.7.0-src/build.xml 2007-12-08 01:04:17.000000000 +0200
-@@ -89,6 +89,9 @@
- <!-- Should Java compilations set the 'optimize' compiler option? -->
- <property name="compile.optimize" value="true"/>
-
-+ <property name="compile.source" value="1.3"/>
-+ <property name="compile.target" value="1.3"/>
-+
- <!-- Construct compile classpath -->
- <path id="compile.classpath">
- <pathelement location="${build.home}/classes"/>
-@@ -164,6 +167,8 @@
- destdir="${build.home}/classes"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
-+ source="${compile.source}"
-+ target="${compile.target}"
- optimize="${compile.optimize}">
- <classpath refid="compile.classpath"/>
- </javac>
-@@ -179,6 +184,8 @@
- destdir="${build.home}/tests"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
-+ source="${compile.source}"
-+ target="${compile.target}"
- optimize="${compile.optimize}">
- <classpath refid="test.classpath"/>
- </javac>
diff --git a/java-commons-beanutils-build.patch b/java-commons-beanutils-build.patch
new file mode 100644
index 0000000..1ad660f
--- /dev/null
+++ b/java-commons-beanutils-build.patch
@@ -0,0 +1,38 @@
+--- commons-beanutils-1.11.0-src/build.xml.orig 2025-05-28 00:00:00.000000000 +0000
++++ commons-beanutils-1.11.0-src/build.xml 2025-05-28 00:00:01.000000000 +0000
+@@ -61,10 +61,10 @@
+
+
+ <!-- Compiler source JDK version -->
+- <property name="compile.source" value="1.5"/>
++ <property name="compile.source" value="1.8"/>
+
+ <!-- Compiler target JDK version -->
+- <property name="compile.target" value="1.5"/>
++ <property name="compile.target" value="1.8"/>
+
+ <!-- Should Java compilations set the 'debug' compiler option? -->
+ <property name="compile.debug" value="true"/>
+@@ -159,7 +159,9 @@
+ <target name="compile.tests" depends="compile"
+ description="Compile unit test cases">
+ <javac srcdir="${test.home}"
+- destdir="${build.home}/tests"
++ destdir="${build.home}/tests"
++ source="${compile.source}"
++ target="${compile.target}"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}">
+@@ -190,10 +192,10 @@
+ <javadoc sourcepath="${source.home}"
+ destdir="${dist.home}/docs/api"
+ packagenames="org.apache.commons.*"
++ additionalparam="-Xdoclint:none"
+ author="true"
+ private="true"
+ version="true"
+- overview="src/java/overview.html"
+ doctitle="<h1>${component.title} (Version ${component.version})</h1>"
+ windowtitle="${component.title} (Version ${component.version})"
+ bottom="Copyright (c) 2000-2008 - Apache Software Foundation">
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/java-commons-beanutils.git/commitdiff/1e17a449cc8ed54d22a0a2018793c90b4fba8164
More information about the pld-cvs-commit
mailing list