[packages/beecrypt] Rel 10

[arekm]

commit 35cc6ebfe532a45336905317ee37e1726bc494bc
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Aug 23 14:31:47 2026 +0200

    Rel 10

 beecrypt-jni-headers.patch | 20 ++++++++++++++++++++
 beecrypt.spec              | 25 +++++++++----------------
 2 files changed, 29 insertions(+), 16 deletions(-)
---
diff --git a/beecrypt.spec b/beecrypt.spec
index d21bbfd..d441a2e 100644
--- a/beecrypt.spec
+++ b/beecrypt.spec
@@ -3,15 +3,17 @@
 #
 # Conditional build:
 %bcond_without	java		# build with Java support
-%bcond_with	javac		# use javac instead of gcj
 %bcond_without	python		# don't build python module
 %bcond_without	static_libs	# don't build static libraries
 #
+
+%{?with_java:%{?use_default_jdk}}
+
 Summary:	The BeeCrypt Cryptography Library
 Summary(pl.UTF-8):	Biblioteka kryptograficzna BeeCrypt
 Name:		beecrypt
 Version:	4.2.1
-Release:	9
+Release:	10
 Epoch:		2
 License:	LGPL v2.1+
 Group:		Libraries
@@ -22,28 +24,19 @@ Patch1:		%{name}-ac_python.patch
 Patch2:		%{name}-armv8.patch
 Patch3:		%{name}-blockmode-endianness.patch
 Patch4:		%{name}-python-tp_free.patch
+Patch5:		%{name}-jni-headers.patch
 URL:		http://sourceforge.net/projects/beecrypt/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-%if %{with java} && !%{with javac}
-%ifarch i586 i686 athlon pentium3 pentium4 %{x8664}
-BuildRequires:	jdk
-%else
-BuildRequires:	gcc-java
-BuildRequires:	libgcj-devel
-%endif
-%endif
-%if %{with java} && %{with javac}
-BuildRequires:	jdk
-%endif
+%{?with_java:%buildrequires_jdk}
 BuildRequires:	libtool
 %if %{with python}
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
 %endif
-BuildRequires:	rpmbuild(macros) >= 1.213
-Obsoletes:	beecrypt-doc
+BuildRequires:	rpmbuild(macros) >= 2.021
+Obsoletes:	beecrypt-doc < 2:4.2.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags_alpha		-mno-explicit-relocs
@@ -148,6 +141,7 @@ bibliotekę BeeCrytp.
 %patch -P2 -p1
 %patch -P3 -p1
 %patch -P4 -p1
+%patch -P5 -p1
 
 # --with-cplusplus or building (even empty) *.cxx into libbeecrypt
 # makes it (and thus rpm) depending on libstdc++ which is unacceptable
@@ -162,7 +156,6 @@ bibliotekę BeeCrytp.
 %configure \
 	%{?with_python:PYTHON=%{__python}} \
 	--disable-openmp \
-	%{?with_javac:ac_cv_have_gcj=no} \
 	%{!?with_static_libs:--disable-static} \
 	--without-cplusplus \
 	--with%{!?with_java:out}-java \
diff --git a/beecrypt-jni-headers.patch b/beecrypt-jni-headers.patch
new file mode 100644
index 0000000..71ad0ea
--- /dev/null
+++ b/beecrypt-jni-headers.patch
@@ -0,0 +1,20 @@
+JDK 9 dropped the jre/ subdirectory that java.home used to point at, so the
+headers now sit in $java_home/include rather than $java_home/../include.
+Without this the JNI header probe fails on any JDK >= 9 and configure quietly
+turns --with-java back off.
+
+--- beecrypt-4.2.1/configure.ac.orig
++++ beecrypt-4.2.1/configure.ac
+@@ -390,7 +390,11 @@
+             darwin*)
+               java_include="$java_home/../../../Headers" ;;
+             *)
+-              java_include="$java_home"/../include ;;
++              if test -d "$java_home/include"; then
++                java_include="$java_home/include"
++              else
++                java_include="$java_home"/../include
++              fi ;;
+             esac
+             if test -d "$java_include"; then
+               ac_cv_java_headers=yes
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/beecrypt.git/commitdiff/35cc6ebfe532a45336905317ee37e1726bc494bc