[packages/java-commons-digester] Up to 2.1

[arekm]

commit 2d50d0b7d9a77cb1c8fb6e0527334c95eedf0d75
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Apr 4 20:20:15 2026 +0200

    Up to 2.1

 java-commons-digester.spec | 60 ++++++++++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 21 deletions(-)
---
diff --git a/java-commons-digester.spec b/java-commons-digester.spec
index 2c1e547..6789e00 100644
--- a/java-commons-digester.spec
+++ b/java-commons-digester.spec
@@ -1,32 +1,27 @@
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
-%bcond_with     java_sun        # build with java-sun
 
+%{?use_default_jdk:%use_default_jdk 8}
 
 %define		srcname commons-digester
 Summary:	Commons Digester - XML to Java object mapping
 Summary(pl.UTF-8):	Commons Digester - odwzorowanie XML-a na obiekty Javy
 Name:		java-commons-digester
-Version:	1.8.1
+Version:	2.1
 Release:	1
 License:	Apache v2.0
 Group:		Libraries/Java
-Source0:	http://www.apache.org/dist/commons/digester/source/%{srcname}-%{version}-src.tar.gz
-# Source0-md5:	bf069f1d8908a66cb732a5c4260c86b7
-URL:		http://commons.apache.org/digester/
-BuildRequires:	ant
-BuildRequires:	ant-junit
+Source0:	https://archive.apache.org/dist/commons/digester/source/%{srcname}-%{version}-src.tar.gz
+# Source0-md5:	b189767c56adabbc74d6f40ba156f133
+URL:		https://commons.apache.org/digester/
 BuildRequires:	java-commons-beanutils
-BuildRequires:	java-commons-collections
 BuildRequires:	java-commons-logging
-BuildRequires:	jdk
+%buildrequires_jdk
 BuildRequires:	jpackage-utils
-BuildRequires:	junit
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.556
 Requires:	java-commons-beanutils
-Requires:	java-commons-collections
 Requires:	java-commons-logging
 Requires:	jpackage-utils
 Provides:	jakarta-commons-digester
@@ -72,22 +67,44 @@ Dokumentacja do Commons Digester.
 %setup -q -n %{srcname}-%{version}-src
 
 %build
-required_jars="commons-beanutils-core commons-collections commons-logging"
-CLASSPATH=$(build-classpath $required_jars):target/classes:target/tests
-%ant -Dbuild.sysclasspath=only clean dist
+export JAVA_HOME="%{java_home}"
+
+CLASSPATH=$(build-classpath commons-beanutils commons-logging)
+export CLASSPATH
+
+install -d target/classes
+%javac -d target/classes \
+	-source 1.5 -target 1.5 \
+	-encoding UTF-8 \
+	-classpath "$CLASSPATH" \
+	$(find src/main/java -name '*.java')
+
+cd target/classes
+%jar cf ../%{srcname}-%{version}.jar org
+cd ../..
+
+%if %{with javadoc}
+%javadoc -d target/apidocs \
+	-source 1.5 \
+	-encoding UTF-8 \
+	-Xdoclint:none \
+	-classpath "$CLASSPATH" \
+	-subpackages org.apache.commons.digester \
+	-sourcepath src/main/java
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 
 # jars
-cp -a dist/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
-ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
+install target/%{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -sf %{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 target/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
 ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 %endif
 
@@ -95,12 +112,13 @@ ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost sym
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
+ln -sf %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
-%doc RELEASE-NOTES.txt
-%{_javadir}/*.jar
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
+%{_javadir}/%{srcname}-%{version}.jar
+%{_javadir}/%{srcname}.jar
 
 %if %{with javadoc}
 %files javadoc
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-commons-digester.git/commitdiff/2d50d0b7d9a77cb1c8fb6e0527334c95eedf0d75