From f5ae8f84c45e64ba2ebda8586bdc3e6f9e6ce54dd38d6fb480117d45dafcf893 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 30 Mar 2022 10:27:32 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/bouncycastle?expand=0&rev=77

---
 bouncycastle.changes |  5 +++++
 bouncycastle.spec    | 12 +++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bouncycastle.changes b/bouncycastle.changes
index 13e59b9..1ebf5ee 100644
--- a/bouncycastle.changes
+++ b/bouncycastle.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 30 10:27:18 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build against the standalone JavaEE modules inconditionally
+
 -------------------------------------------------------------------
 Fri Mar 18 18:47:50 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/bouncycastle.spec b/bouncycastle.spec
index 83190ea..881e71e 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -41,15 +41,13 @@ Patch1:         bouncycastle-osgi.patch
 BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  fdupes
+BuildRequires:  glassfish-activation-api
 BuildRequires:  javamail
 BuildRequires:  javapackages-local
 Requires(post): javapackages-tools
 Requires(postun):javapackages-tools
 Provides:       bcprov = %{version}-%{release}
 BuildArch:      noarch
-%if 0%{?suse_version} > 1500
-BuildRequires:  glassfish-activation-api
-%endif
 
 %description
 The Bouncy Castle Crypto package is a Java implementation of cryptographic
@@ -128,11 +126,7 @@ ant -f ant/jdk15+.xml \
   -Dbc.javac.source=8 -Dbc.javac.target=8 \
   -Djunit.jar.home=$(build-classpath junit) \
   -Dmail.jar.home=$(build-classpath javax.mail) \
-%if 0%{?suse_version} > 1500
   -Dactivation.jar.home=$(build-classpath glassfish-activation-api) \
-%else
-  -Dactivation.jar.home= \
-%endif
   -Drelease.debug=true \
   clean build-provider build
 
@@ -159,7 +153,7 @@ cp -r build/artifacts/jdk1.5/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
 {
   # Rebuild the list of security providers in classpath.security
   suffix=security/classpath.security
-  secfiles="%{_prefix}/lib/$suffix %{_prefix}/lib64/$suffix"
+  secfiles="%{_prefix}/lib/$suffix %{_libdir}/$suffix"
 
   for secfile in $secfiles
   do
@@ -183,7 +177,7 @@ if [ $1 -eq 0 ] ; then
   {
     # Rebuild the list of security providers in classpath.security
     suffix=security/classpath.security
-    secfiles="%{_prefix}/lib/$suffix %{_prefix}/lib64/$suffix"
+    secfiles="%{_prefix}/lib/$suffix %{_libdir}/$suffix"
 
     for secfile in $secfiles
     do