From 63367728e5550d1ceb6f4354892c584717ae4ecb03f9f2288557fbb2d23a9d53 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 Mar 2022 03:36:52 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bouncycastle?expand=0&rev=71 --- bouncycastle.changes | 6 ++++++ bouncycastle.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bouncycastle.changes b/bouncycastle.changes index 8a2aef1..8b17391 100644 --- a/bouncycastle.changes +++ b/bouncycastle.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 17 03:36:32 UTC 2022 - Fridrich Strba + +- Add jaf dependency so that we can build with JDK that does not + contain the JavaEE modules + ------------------------------------------------------------------- Tue Jul 27 16:03:32 UTC 2021 - Fridrich Strba diff --git a/bouncycastle.spec b/bouncycastle.spec index 059351f..1eecca8 100644 --- a/bouncycastle.spec +++ b/bouncycastle.spec @@ -1,7 +1,7 @@ # # spec file for package bouncycastle # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,6 +41,7 @@ Patch1: bouncycastle-osgi.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: fdupes +BuildRequires: jaf BuildRequires: javamail BuildRequires: javapackages-local Requires(post): javapackages-tools @@ -125,7 +126,7 @@ 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) \ - -Dactivation.jar.home= \ + -Dactivation.jar.home=$(build-classpath jaf/javax.activation-api) \ -Drelease.debug=true \ clean build-provider build From 87e03ab720f5e3dfc07d5d6e0c2980a578d20e96fee0d76cd3675f4aa98d7e23 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 Mar 2022 10:17:41 +0000 Subject: [PATCH 2/5] 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 From cb71cbe25cf3157b90f8d657ea74f0bf34750b0a8bc1c8ecf0fcd8a2f3b5b515 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 18 Mar 2022 09:00:47 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bouncycastle?expand=0&rev=73 --- bouncycastle.changes | 4 ++-- bouncycastle.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bouncycastle.changes b/bouncycastle.changes index 8b17391..8f8deb7 100644 --- a/bouncycastle.changes +++ b/bouncycastle.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Thu Mar 17 03:36:32 UTC 2022 - Fridrich Strba -- Add jaf dependency so that we can build with JDK that does not - contain the JavaEE modules +- Add glassfish-activation-api dependency so that we can build with + JDK that does not contain the JavaEE modules ------------------------------------------------------------------- Tue Jul 27 16:03:32 UTC 2021 - Fridrich Strba diff --git a/bouncycastle.spec b/bouncycastle.spec index 434d01b..6c735eb 100644 --- a/bouncycastle.spec +++ b/bouncycastle.spec @@ -48,7 +48,7 @@ Requires(postun):javapackages-tools Provides: bcprov = %{version}-%{release} BuildArch: noarch %if 0%{?suse_version} > 1500 -BuildRequires: jaf +BuildRequires: glassfish-activation-api %endif %description @@ -129,7 +129,7 @@ ant -f ant/jdk15+.xml \ -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) \ + -Dactivation.jar.home=$(build-classpath glassfish-activation-api) \ %else -Dactivation.jar.home= \ %endif From 6f517de642441f2d2d2a67a7611550f35f0164655a5da08bf77125373d3b531d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 18 Mar 2022 18:48:15 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bouncycastle?expand=0&rev=74 --- bouncycastle.changes | 5 +++++ bouncycastle.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bouncycastle.changes b/bouncycastle.changes index 8f8deb7..13e59b9 100644 --- a/bouncycastle.changes +++ b/bouncycastle.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 18 18:47:50 UTC 2022 - Fridrich Strba + +- Build with source/target levels 8 + ------------------------------------------------------------------- Thu Mar 17 03:36:32 UTC 2022 - Fridrich Strba diff --git a/bouncycastle.spec b/bouncycastle.spec index 6c735eb..a88855a 100644 --- a/bouncycastle.spec +++ b/bouncycastle.spec @@ -125,7 +125,7 @@ find . -type f -name "*.jar" -exec rm -f {} \; echo "package.version:\ %{version}" >> bc-build.properties echo "bundle.version:\ %{version}.0" >> bc-build.properties ant -f ant/jdk15+.xml \ - -Dbc.javac.source=6 -Dbc.javac.target=6 \ + -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 From 843f475c768491a42a3882a519cb8bf42014898b537220816cb75f595c54a886 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 20 Mar 2022 07:43:11 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bouncycastle?expand=0&rev=75 --- bouncycastle.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bouncycastle.spec b/bouncycastle.spec index a88855a..83190ea 100644 --- a/bouncycastle.spec +++ b/bouncycastle.spec @@ -159,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 %{_libdir}/$suffix" + secfiles="%{_prefix}/lib/$suffix %{_prefix}/lib64/$suffix" for secfile in $secfiles do @@ -183,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 %{_libdir}/$suffix" + secfiles="%{_prefix}/lib/$suffix %{_prefix}/lib64/$suffix" for secfile in $secfiles do