import ldapjdk-4.23.0-1.module+el8.5.0+11983+6ba118b4

This commit is contained in:
CentOS Sources 2021-11-09 05:00:20 -05:00 committed by Stepan Oksanichenko
parent 38d83d332d
commit 52f2ba4896
3 changed files with 52 additions and 47 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/ldap-sdk-4.22.0.tar.gz
SOURCES/ldap-sdk-4.23.0.tar.gz

View File

@ -1 +1 @@
4c38cc1c8b2ca32bd458c25ae0eaf847ace7fe93 SOURCES/ldap-sdk-4.22.0.tar.gz
c56d68eb01fa3e0873a70317048d46addec89300 SOURCES/ldap-sdk-4.23.0.tar.gz

View File

@ -8,9 +8,11 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+
BuildArch: noarch
Version: 4.22.0
# 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: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
#global _phase -alpha1
%global spname ldapsp
%global filtname ldapfilt
@ -31,41 +33,40 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap
# > ldap-sdk-VERSION-RELEASE.patch
# Patch: ldap-sdk-VERSION-RELEASE.patch
################################################################################
# Java
################################################################################
%if 0%{?fedora} && 0%{?fedora} <= 32 || 0%{?rhel} && 0%{?rhel} <= 8
%define java_devel java-1.8.0-openjdk-devel
%define java_headless java-1.8.0-openjdk-headless
%define java_home /usr/lib/jvm/java-1.8.0-openjdk
%else
%define java_devel java-11-openjdk-devel
%define java_headless java-11-openjdk-headless
%define java_home /usr/lib/jvm/java-11-openjdk
%endif
################################################################################
# Build Dependencies
################################################################################
# autosetup
BuildRequires: git
BuildRequires: ant
BuildRequires: java-devel
%if 0%{?rhel} && 0%{?rhel} <= 7
BuildRequires: jpackage-utils >= 0:1.5
%else
BuildRequires: %{java_devel}
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
BuildRequires: jss >= 4.9.0, jss < 5.0.0
################################################################################
# Runtime Dependencies
################################################################################
Requires: %{java_headless}
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
Requires: jss >= 4.9.0, jss < 5.0.0
%description
The Mozilla LDAP SDKs enable you to write applications which access,
@ -86,7 +87,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
@ -95,17 +96,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 . jss
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
@ -117,28 +117,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
@ -149,15 +148,21 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
################################################################################
%changelog
* Mon Jul 26 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 4.23.0-1
- Rebase to LDAP SDK 4.23.0
* Fri Jun 11 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 4.23.0-0.1
- Rebase to LDAP SDK 4.23.0-alpha1
* Tue May 26 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 4.22.0-1
- Rebased to LDAP SDK 4.22.0
- Rebase to LDAP SDK 4.22.0
* Thu Oct 31 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 4.21.0-2
- Bump min required JSS version to 4.6.0
* Mon Jun 10 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 4.21.0-1
- Rebased to LDAP SDK 4.21.0
- Rebase to LDAP SDK 4.21.0
* Fri Aug 10 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 4.20.0-0
- Rebased to LDAP SDK 4.20.0
- Rebase to LDAP SDK 4.20.0