[packages/java-bnd] Rel 2

[arekm]

commit df8d4bb98df40a4c09540895a9245691a4104f08
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Apr 4 15:05:59 2026 +0200

    Rel 2

 java-bnd-jdk8.patch | 22 ++++++++++++++++++++++
 java-bnd.spec       | 12 ++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/java-bnd.spec b/java-bnd.spec
index 8139ebb..31d7781 100644
--- a/java-bnd.spec
+++ b/java-bnd.spec
@@ -2,11 +2,13 @@
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
 
+%{?use_default_jdk:%use_default_jdk 8}
+
 %define		srcname		bnd
 Summary:	BND Tool
 Name:		java-%{srcname}
 Version:	0.0.363
-Release:	1
+Release:	2
 License:	ASL 2.0
 Group:		Development/Tools
 URL:		http://www.aQute.biz/Code/Bnd
@@ -17,11 +19,12 @@ Source0:	http://www.aqute.biz/repo/biz/aQute/bnd/%{version}/%{srcname}-%{version
 # Source0-md5:	1d36d0271381964304c08b00b5fd1b4a
 Source2:	aqute-service.tar.gz
 # Source2-md5:	11fe2398149f85066f6d0b6dc8af225b
+Patch0:		java-bnd-jdk8.patch
 BuildRequires:	ant
-BuildRequires:	jdk
+%buildrequires_jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.553
+BuildRequires:	rpmbuild(macros) >= 1.556
 Obsoletes:	aqute-bnd
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -59,6 +62,7 @@ mv OSGI-OPT/src src/main/java
 tar -xsf %{SOURCE2} -C src/main/java
 sed -i "s|import aQute.lib.filter.*;||g" src/main/java/aQute/bnd/make/ComponentDef.java
 sed -i "s|import aQute.lib.filter.*;||g" src/main/java/aQute/bnd/make/ServiceComponent.java
+%patch -P0 -p1
 
 # get rid of eclipse plugins which are not usable anyway and complicate
 # things
@@ -84,7 +88,7 @@ export CLASSPATH
 %javac -d target/classes -target 1.5 -source 1.5 $(find src/main/java -type f -name "*.java")
 
 %if %{with javadoc}
-%javadoc -d target/site/apidocs -sourcepath src/main/java aQute.lib.header aQute.lib.osgi aQute.lib.qtokens aQute.lib.filter
+%javadoc -Xdoclint:none -d target/site/apidocs -sourcepath src/main/java aQute.lib.header aQute.lib.osgi aQute.lib.qtokens aQute.lib.filter
 %endif
 
 cp -p LICENSE maven-dependencies.txt plugin.xml pom.xml target/classes
diff --git a/java-bnd-jdk8.patch b/java-bnd-jdk8.patch
new file mode 100644
index 0000000..341d58a
--- /dev/null
+++ b/java-bnd-jdk8.patch
@@ -0,0 +1,22 @@
+--- a/src/main/java/aQute/bnd/ant/WrapTask.java	2026-04-04 13:46:54.778909815 +0200
++++ b/src/main/java/aQute/bnd/ant/WrapTask.java	2026-04-04 13:47:14.479904821 +0200
+@@ -42,7 +42,7 @@
+ 				String name = file.getName();
+ 				name = name.replaceFirst("(\\.jar)?$", ".bnd");
+ 				File bndFile = new File(definitions, name );
+-				bnd.doWrap(bndFile.exists()?bndFile:null, file, output, null, 0, getProject().getProperties());
++				bnd.doWrap(bndFile.exists()?bndFile:null, file, output, null, 0, (Map)getProject().getProperties());
+ 				failed |= report(bnd);
+ 			}
+ 		} catch (Exception e) {
+--- a/src/main/java/aQute/bnd/signing/Signer.java	2026-04-04 13:46:54.780901511 +0200
++++ b/src/main/java/aQute/bnd/signing/Signer.java	2026-04-04 13:47:22.316571488 +0200
+@@ -7,7 +7,7 @@
+ import java.util.jar.*;
+ import java.util.regex.*;
+ 
+-import aQute.lib.base64.*;
++import aQute.lib.base64.Base64;
+ import aQute.lib.osgi.*;
+ 
+ /**
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-bnd.git/commitdiff/df8d4bb98df40a4c09540895a9245691a4104f08