RHEL 9.0.0 Alpha bootstrap
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/ldapjdk#d04113c89f850def108d9baeba8387e409a1e7d5
This commit is contained in:
parent
bfe1ebc07e
commit
9968018c08
5
.gitignore
vendored
5
.gitignore
vendored
@ -0,0 +1,5 @@
|
|||||||
|
ldapjdk-4.18.tar.gz
|
||||||
|
/ldapjdk-4.19.tar.gz
|
||||||
|
/ldap-sdk-4.20.0.tar.gz
|
||||||
|
/ldap-sdk-4.21.0.tar.gz
|
||||||
|
/ldap-sdk-4.22.0.tar.gz
|
65
0001-Use-JDK8-target-as-suggested-by-Fabio.patch
Normal file
65
0001-Use-JDK8-target-as-suggested-by-Fabio.patch
Normal 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
|
||||||
|
|
9
copr-build.sh
Executable file
9
copr-build.sh
Executable file
@ -0,0 +1,9 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
REPO=$1
|
||||||
|
|
||||||
|
if [ "$REPO" == "" ]; then
|
||||||
|
REPO="pki-10.6"
|
||||||
|
fi
|
||||||
|
|
||||||
|
fedpkg copr-build --nowait $REPO
|
182
ldapjdk.spec
Normal file
182
ldapjdk.spec
Normal file
@ -0,0 +1,182 @@
|
|||||||
|
################################################################################
|
||||||
|
Name: ldapjdk
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
Summary: LDAP SDK
|
||||||
|
URL: http://www.dogtagpki.org/
|
||||||
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||||
|
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
Version: 4.22.0
|
||||||
|
Release: 4%{?_timestamp}%{?_commit_id}%{?dist}
|
||||||
|
# global _phase -a1
|
||||||
|
|
||||||
|
%global spname ldapsp
|
||||||
|
%global filtname ldapfilt
|
||||||
|
%global beansname ldapbeans
|
||||||
|
|
||||||
|
# To create a tarball from a version tag:
|
||||||
|
# $ git archive \
|
||||||
|
# --format=tar.gz \
|
||||||
|
# --prefix ldap-sdk-<version>/ \
|
||||||
|
# -o ldap-sdk-<version>.tar.gz \
|
||||||
|
# <version tag>
|
||||||
|
Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap-sdk-%{version}%{?_phase}.tar.gz
|
||||||
|
|
||||||
|
# To create a patch for all changes since a version tag:
|
||||||
|
# $ git format-patch \
|
||||||
|
# --stdout \
|
||||||
|
# <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
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
# autosetup
|
||||||
|
BuildRequires: git
|
||||||
|
|
||||||
|
BuildRequires: ant
|
||||||
|
BuildRequires: java-devel
|
||||||
|
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||||
|
BuildRequires: jpackage-utils >= 0:1.5
|
||||||
|
%else
|
||||||
|
BuildRequires: javapackages-local
|
||||||
|
%endif
|
||||||
|
BuildRequires: slf4j
|
||||||
|
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||||
|
# no slf4j-jdk14
|
||||||
|
%else
|
||||||
|
BuildRequires: slf4j-jdk14
|
||||||
|
%endif
|
||||||
|
BuildRequires: jss >= 4.6.0
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
# Runtime Dependencies
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
Requires: jpackage-utils >= 0:1.5
|
||||||
|
Requires: slf4j
|
||||||
|
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||||
|
# no slf4j-jdk14
|
||||||
|
%else
|
||||||
|
Requires: slf4j-jdk14
|
||||||
|
%endif
|
||||||
|
Requires: jss >= 4.6.0
|
||||||
|
|
||||||
|
|
||||||
|
%description
|
||||||
|
The Mozilla LDAP SDKs enable you to write applications which access,
|
||||||
|
manage, and update the information stored in an LDAP directory.
|
||||||
|
|
||||||
|
%license docs/ldapjdk/license.txt
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
%package javadoc
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
Summary: Javadoc for %{name}
|
||||||
|
|
||||||
|
%description javadoc
|
||||||
|
Javadoc for %{name}
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
%prep
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
%autosetup -n ldap-sdk-%{version}%{?_phase} -p 1 -S git
|
||||||
|
|
||||||
|
# Remove all bundled jars, we must build against build-system jars
|
||||||
|
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 )
|
||||||
|
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
|
||||||
|
sh -x ant dist
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
%install
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
||||||
|
install -m 644 java-sdk/dist/packages/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
|
||||||
|
install -m 644 java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%{spname}.jar
|
||||||
|
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 -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||||
|
cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
%files -f .mfiles
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
%{_javadir}/%{spname}*.jar
|
||||||
|
%{_javadir}/%{filtname}*.jar
|
||||||
|
%{_javadir}/%{beansname}*.jar
|
||||||
|
%{_javadir}-1.3.0/*.jar
|
||||||
|
|
||||||
|
################################################################################
|
||||||
|
%files javadoc
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
%dir %{_javadocdir}/%{name}
|
||||||
|
%{_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
|
||||||
|
|
||||||
|
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 4.22.0-2
|
||||||
|
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||||
|
|
||||||
|
* Wed Jun 10 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.22.0-1
|
||||||
|
- Rebase to match latest upstream version: 4.22.0
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.21.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Aug 08 2019 Dogtag PKI Team <pki-team@redhat.com> 4.21.0-2
|
||||||
|
- Bump min required JSS version to 4.6.0
|
||||||
|
|
||||||
|
* Thu Aug 08 2019 Dogtag PKI Team <pki-team@redhat.com> 4.21.0-1
|
||||||
|
- Rebased to LDAP SDK 4.21.0
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.20.0-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.20.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Aug 10 2018 Dogtag PKI Team <pki-team@redhat.com> 4.20.0-1
|
||||||
|
- Rebased to LDAP SDK 4.20.0
|
||||||
|
|
1
sources
Normal file
1
sources
Normal file
@ -0,0 +1 @@
|
|||||||
|
SHA512 (ldap-sdk-4.22.0.tar.gz) = 5f8d2a2c0042f281e054cfd3dc1604a5038a77b175268b415cd708031940064b62ec41043bc49d25fdd860aaaaa2a2de95a0c92c409951bfac21770c2d4ff1be
|
7
sources-update.sh
Executable file
7
sources-update.sh
Executable file
@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
SOURCE=$1
|
||||||
|
TARGET=`basename $1`
|
||||||
|
|
||||||
|
cp $SOURCE $TARGET
|
||||||
|
sha512sum --tag $TARGET > sources
|
Loading…
Reference in New Issue
Block a user