[packages/java-commons-discovery] Rel 2

arekm arekm at pld-linux.org
Sat Apr 4 13:02:49 CEST 2026


commit c733b63dd0a47b5c5e94f96c5eec39dd242005e0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Apr 4 13:02:42 2026 +0200

    Rel 2

 java-commons-discovery-javadoc-doclint.patch | 11 +++++++++++
 java-commons-discovery.spec                  | 12 ++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/java-commons-discovery.spec b/java-commons-discovery.spec
index d10ddd2..4b9a3c9 100644
--- a/java-commons-discovery.spec
+++ b/java-commons-discovery.spec
@@ -1,23 +1,26 @@
 %bcond_without	javadoc	# Build api docs
+
+%{?use_default_jdk:%use_default_jdk 8}
 %define		srcname	commons-discovery
 Summary:	Commons Discovery - discovering implementations for pluggable interfaces
 Summary(pl.UTF-8):	Pakiet Commons Discovery - wykrywanie implementacji dołączalnych interfejsów
 Name:		java-commons-discovery
 Version:	0.2
-Release:	1
+Release:	2
 License:	Apache
 Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/commons/discovery/source/commons-discovery-%{version}-src.tar.gz
 # Source0-md5:	57968a150ea9b7158ac0e995c8f24080
 Patch0:		jakarta-commons-discovery-source.patch
+Patch1:		java-commons-discovery-javadoc-doclint.patch
 URL:		http://commons.apache.org/commons/discovery/
 BuildRequires:	ant
 BuildRequires:	java-commons-logging >= 1.0.1
-BuildRequires:	java-gcj-compat-devel
+%buildrequires_jdk
 BuildRequires:	jpackage-utils
-BuildRequires:	junit >= 3.7
+BuildRequires:	java-junit >= 3.7
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.556
 Requires:	java-commons-logging >= 1.0.1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,6 +57,7 @@ Dokumentacja javadoc dla pakietu %{name}.
 %setup -q -n commons-discovery-%{version}-src
 chmod -R u+w .
 %patch -P0 -p1
+%patch -P1 -p1
 
 cp discovery/LICENSE.txt LICENSE
 
diff --git a/java-commons-discovery-javadoc-doclint.patch b/java-commons-discovery-javadoc-doclint.patch
new file mode 100644
index 0000000..3bcb88f
--- /dev/null
+++ b/java-commons-discovery-javadoc-doclint.patch
@@ -0,0 +1,11 @@
+--- commons-discovery-0.2-src/discovery/build.xml.orig	2026-04-04 12:40:22.815693842 +0200
++++ commons-discovery-0.2-src/discovery/build.xml	2026-04-04 12:40:22.844365520 +0200
+@@ -147,6 +147,8 @@
+     <mkdir      dir="${dist.home}/docs"/>
+     <mkdir      dir="${dist.home}/docs/api"/>
+     <javadoc sourcepath="${source.home}"
++                additionalparam="-Xdoclint:none"
++                source="1.4"
+                 destdir="${dist.home}/docs/api"
+            packagenames="org.apache.commons.*"
+                  author="true"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-commons-discovery.git/commitdiff/c733b63dd0a47b5c5e94f96c5eec39dd242005e0



More information about the pld-cvs-commit mailing list