rpms/ldapjdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebuild for JDK8 compatibility

Browse Source 
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
This commit is contained in:
Alexander Scheel 2020-08-17 18:58:23 -04:00
parent c8768c07d4
commit d04113c89f
No known key found for this signature in database
GPG Key ID: C0D6C737D0003143
2 changed files with 70 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
0001-Use-JDK8-target-as-suggested-by-Fabio.patch Normal file
View File

@ -0,0 +1,65 @@
From a652cceb4b8993c0af90d3fa590bcf92fadcfd71 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Mon, 17 Aug 2020 18:54:51 -0400
Subject: [PATCH] Use JDK8 target as suggested by Fabio
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
---
java-sdk/build.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/java-sdk/build.xml b/java-sdk/build.xml
index e310c73..545bcb1 100644
--- a/java-sdk/build.xml
+++ b/java-sdk/build.xml
@@ -187,14 +187,20 @@
<javac srcdir="${basedir}/ldapjdk/com" destdir="${jdk.dist}"
excludes="cvs/**"
classpath="${jsselibs}:${slf4j.lib}"
+ source="1.8"
+ target="1.8"
/>
<javac srcdir="${basedir}/ldapjdk/netscape" destdir="${jdk.dist}"
excludes="cvs/**"
classpath="${jsselibs}:${slf4j.lib}"
+ source="1.8"
+ target="1.8"
/>
<javac srcdir="${basedir}/tools" destdir="${jdk.dist}"
excludes="cvs/**"
classpath="${jsselibs}:${slf4j.lib}"
+ source="1.8"
+ target="1.8"
/>
</target>
@@ -202,6 +208,8 @@
<javac srcdir="${basedir}/ldapfilter" destdir="${filter.dist}"
excludes="cvs/**"
classpath="${jdk.dist}:${jsselibs}:${slf4j.lib}"
+ source="1.8"
+ target="1.8"
/>
</target>
@@ -210,6 +218,8 @@
<javac srcdir="${basedir}/ldapbeans" destdir="${jdk.dist}"
excludes="cvs/**"
classpath="${jsselibs}:${slf4j.lib}"
+ source="1.8"
+ target="1.8"
/>
</target>
@@ -218,6 +228,8 @@
<javac srcdir="${basedir}/ldapsp" destdir="${jndi.dist}"
excludes="cvs/**"
classpath="${jsselibs}:${basedir}/ldapsp/lib/jndi.jar:${slf4j.lib}"
+ source="1.8"
+ target="1.8"
/>
</target>
--
2.26.2

6
ldapjdk.spec
View File

@ -9,7 +9,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
BuildArch: noarch
Version: 4.22.0
Release: 3%{?_timestamp}%{?_commit_id}%{?dist}
Release: 4%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
%global spname ldapsp
@ -30,6 +30,7 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap
# <version tag> \
# > ldap-sdk-VERSION-RELEASE.patch
# Patch: ldap-sdk-VERSION-RELEASE.patch
Patch1: 0001-Use-JDK8-target-as-suggested-by-Fabio.patch
################################################################################
# Build Dependencies
@ -149,6 +150,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
################################################################################
%changelog
* Mon Aug 17 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.22.0-4
- Rebuilt for JDK8 compatibility
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.22.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild