Rebase to LDAP SDK 4.23.0-alpha1
This commit is contained in:
Endi S. Dewata
parent
fe4eae1323
commit
3c2b54cfbc
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ ldapjdk-4.18.tar.gz
|
||||
/ldap-sdk-4.20.0.tar.gz
|
||||
/ldap-sdk-4.21.0.tar.gz
|
||||
/ldap-sdk-4.22.0.tar.gz
|
||||
/ldap-sdk-4.23.0-alpha1.tar.gz
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
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
|
||||
|
||||
66
ldapjdk.spec
66
ldapjdk.spec
@ -8,9 +8,11 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
Version: 4.22.0
|
||||
Release: 5%{?_timestamp}%{?_commit_id}%{?dist}
|
||||
# global _phase -a1
|
||||
# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
|
||||
# For official (i.e. supported) releases, use x.y.z-r where r >=1.
|
||||
Version: 4.23.0
|
||||
Release: 0.1.alpha1%{?_timestamp}%{?_commit_id}%{?dist}
|
||||
%global _phase -alpha1
|
||||
|
||||
%global spname ldapsp
|
||||
%global filtname ldapfilt
|
||||
@ -30,17 +32,21 @@ 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
|
||||
|
||||
################################################################################
|
||||
# Java
|
||||
################################################################################
|
||||
|
||||
%define java_devel java-11-openjdk-devel
|
||||
%define java_headless java-11-openjdk-headless
|
||||
%define java_home /usr/lib/jvm/jre-11-openjdk
|
||||
|
||||
################################################################################
|
||||
# Build Dependencies
|
||||
################################################################################
|
||||
|
||||
# autosetup
|
||||
BuildRequires: git
|
||||
|
||||
BuildRequires: ant
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: %{java_devel}
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
BuildRequires: jpackage-utils >= 0:1.5
|
||||
%else
|
||||
@ -58,6 +64,7 @@ BuildRequires: jss >= 4.6.0
|
||||
# Runtime Dependencies
|
||||
################################################################################
|
||||
|
||||
Requires: %{java_headless}
|
||||
Requires: jpackage-utils >= 0:1.5
|
||||
Requires: slf4j
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
@ -87,7 +94,7 @@ Javadoc for %{name}
|
||||
%prep
|
||||
################################################################################
|
||||
|
||||
%autosetup -n ldap-sdk-%{version}%{?_phase} -p 1 -S git
|
||||
%autosetup -n ldap-sdk-%{version}%{?_phase} -p 1
|
||||
|
||||
# Remove all bundled jars, we must build against build-system jars
|
||||
rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar
|
||||
@ -96,17 +103,16 @@ rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar
|
||||
%build
|
||||
################################################################################
|
||||
|
||||
# Link to build-system BRs
|
||||
pwd
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
( cd java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 jsse jaas jndi )
|
||||
%else
|
||||
( cd java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 )
|
||||
pushd java-sdk/ldapjdk/lib
|
||||
build-jar-repository -s -p . jss4
|
||||
popd
|
||||
|
||||
ln -s /usr/lib/jvm-exports/java/{jsse,jaas,jndi}.jar java-sdk/ldapjdk/lib
|
||||
%endif
|
||||
cd java-sdk
|
||||
if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi
|
||||
|
||||
pushd java-sdk
|
||||
export JAVA_HOME=%{java_home}
|
||||
sh -x ant dist
|
||||
popd
|
||||
|
||||
################################################################################
|
||||
%install
|
||||
@ -118,28 +124,27 @@ install -m 644 java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%
|
||||
install -m 644 java-sdk/dist/packages/%{filtname}.jar $RPM_BUILD_ROOT%{_javadir}/%{filtname}.jar
|
||||
install -m 644 java-sdk/dist/packages/%{beansname}.jar $RPM_BUILD_ROOT%{_javadir}/%{beansname}.jar
|
||||
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-1.3.0
|
||||
|
||||
pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0
|
||||
ln -fs ../java/*%{spname}.jar jndi-ldap.jar
|
||||
popd
|
||||
|
||||
mkdir -p %{buildroot}%{_mavenpomdir}
|
||||
sed -i 's/@VERSION@/%{version}/g' %{name}.pom
|
||||
install -pm 644 %{name}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "ldapsdk:ldapsdk"
|
||||
install -pm 644 java-sdk/ldapjdk/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom
|
||||
install -pm 644 java-sdk/ldapfilter/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapfilter.pom
|
||||
install -pm 644 java-sdk/ldapbeans/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapbeans.pom
|
||||
install -pm 644 java-sdk/ldapsp/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapsp.pom
|
||||
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
|
||||
################################################################################
|
||||
%files -f .mfiles
|
||||
%files
|
||||
################################################################################
|
||||
|
||||
%{_javadir}/%{name}.jar
|
||||
%{_javadir}/%{spname}*.jar
|
||||
%{_javadir}/%{filtname}*.jar
|
||||
%{_javadir}/%{beansname}*.jar
|
||||
%{_javadir}-1.3.0/*.jar
|
||||
%{_mavenpomdir}/JPP-ldapjdk.pom
|
||||
%{_mavenpomdir}/JPP-ldapsp.pom
|
||||
%{_mavenpomdir}/JPP-ldapfilter.pom
|
||||
%{_mavenpomdir}/JPP-ldapbeans.pom
|
||||
|
||||
################################################################################
|
||||
%files javadoc
|
||||
@ -150,6 +155,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
|
||||
################################################################################
|
||||
%changelog
|
||||
* Mon Jun 07 2021 Dogtag PKI Team <pki-devel@redhat.com> - 4.23.0-0.1
|
||||
- Rebase to LDAP SDK 4.23.0-alpha1
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.22.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (ldap-sdk-4.22.0.tar.gz) = 5f8d2a2c0042f281e054cfd3dc1604a5038a77b175268b415cd708031940064b62ec41043bc49d25fdd860aaaaa2a2de95a0c92c409951bfac21770c2d4ff1be
|
||||
SHA512 (ldap-sdk-4.23.0-alpha1.tar.gz) = 07146fda16dea7c84ed5f66bf3566120a037a3a4ab80a37030429a66d22b8e42d058b67d04f3a6c7efe9a76d1fd2b3ad62cf270684f8626dcfc996778a1cdbbe
|
||||
|
||||
Loading…
Reference in New Issue
Block a user