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

---
 bouncycastle.spec | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/bouncycastle.spec b/bouncycastle.spec
index 1eecca8..434d01b 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -41,13 +41,15 @@ Patch1:         bouncycastle-osgi.patch
 BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  fdupes
-BuildRequires:  jaf
 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:  jaf
+%endif
 
 %description
 The Bouncy Castle Crypto package is a Java implementation of cryptographic
@@ -126,7 +128,11 @@ ant -f ant/jdk15+.xml \
   -Dbc.javac.source=6 -Dbc.javac.target=6 \
   -Djunit.jar.home=$(build-classpath junit) \
   -Dmail.jar.home=$(build-classpath javax.mail) \
+%if 0%{?suse_version} > 1500
   -Dactivation.jar.home=$(build-classpath jaf/javax.activation-api) \
+%else
+  -Dactivation.jar.home= \
+%endif
   -Drelease.debug=true \
   clean build-provider build
 
@@ -153,7 +159,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
@@ -177,7 +183,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