Compare commits

...

No commits in common. "c9" and "c8-stream-10.6" have entirely different histories.

3 changed files with 87 additions and 87 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/ldap-sdk-5.5.0.tar.gz SOURCES/ldap-sdk-4.24.0.tar.gz

View File

@ -1 +1 @@
e768bb087a0f72e81b17d90eb1a37fb900fabf6e SOURCES/ldap-sdk-5.5.0.tar.gz 5ae502d4aec13f94d581384faedf2fa67d87cffa SOURCES/ldap-sdk-4.24.0.tar.gz

View File

@ -5,29 +5,26 @@ Name: ldapjdk
%global product_id idm-ldapjdk %global product_id idm-ldapjdk
# Upstream version number: # Upstream version number:
%global major_version 5 %global major_version 4
%global minor_version 5 %global minor_version 24
%global update_version 0 %global update_version 0
# Downstream release number:
# - development/stabilization (unsupported): 0.<n> where n >= 1
# - GA/update (supported): <n> where n >= 1
%global release_number 1
# Development phase:
# - development (unsupported): alpha<n> where n >= 1
# - stabilization (unsupported): beta<n> where n >= 1
# - GA/update (supported): <none>
#global phase
%undefine timestamp
%undefine commit_id
Summary: LDAP SDK Summary: LDAP SDK
URL: https://github.com/dogtagpki/ldap-sdk URL: https://github.com/dogtagpki/ldap-sdk
License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later License: MPLv1.1 or GPLv2+ or LGPLv2+
BuildArch: noarch
# 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.
%global release_number 1
Version: %{major_version}.%{minor_version}.%{update_version} Version: %{major_version}.%{minor_version}.%{update_version}
Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} Release: %{release_number}%{?_timestamp}%{?_commit_id}%{?dist}
#global _phase -alpha1
%global spname ldapsp
%global filtname ldapfilt
%global beansname ldapbeans
# To create a tarball from a version tag: # To create a tarball from a version tag:
# $ git archive \ # $ git archive \
@ -35,7 +32,7 @@ Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timesta
# --prefix ldap-sdk-<version>/ \ # --prefix ldap-sdk-<version>/ \
# -o ldap-sdk-<version>.tar.gz \ # -o ldap-sdk-<version>.tar.gz \
# <version tag> # <version tag>
Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?phase}/ldap-sdk-%{version}%{?phase:-}%{?phase}.tar.gz 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: # To create a patch for all changes since a version tag:
# $ git format-patch \ # $ git format-patch \
@ -44,18 +41,19 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?p
# > ldap-sdk-VERSION-RELEASE.patch # > ldap-sdk-VERSION-RELEASE.patch
# Patch: ldap-sdk-VERSION-RELEASE.patch # Patch: ldap-sdk-VERSION-RELEASE.patch
BuildArch: noarch
%if 0%{?java_arches:1}
ExclusiveArch: %{java_arches} noarch
%endif
################################################################################ ################################################################################
# Java # Java
################################################################################ ################################################################################
%define java_devel java-17-openjdk-devel %if 0%{?fedora} && 0%{?fedora} <= 32 || 0%{?rhel} && 0%{?rhel} <= 8
%define java_headless java-17-openjdk-headless %define java_devel java-1.8.0-openjdk-devel
%define java_home %{_jvmdir}/jre-17-openjdk %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 # Build Dependencies
@ -63,10 +61,11 @@ ExclusiveArch: %{java_arches} noarch
BuildRequires: ant BuildRequires: ant
BuildRequires: %{java_devel} BuildRequires: %{java_devel}
BuildRequires: maven-local BuildRequires: javapackages-local
BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: slf4j
BuildRequires: mvn(org.slf4j:slf4j-jdk14) BuildRequires: slf4j-jdk14
BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0
BuildRequires: jss >= 4.11.0, jss < 5.0.0
%description %description
The Mozilla LDAP SDKs enable you to write applications which access, The Mozilla LDAP SDKs enable you to write applications which access,
@ -79,9 +78,11 @@ manage, and update the information stored in an LDAP directory.
Summary: LDAP SDK Summary: LDAP SDK
Requires: %{java_headless} Requires: %{java_headless}
Requires: mvn(org.slf4j:slf4j-api) Requires: jpackage-utils >= 0:1.5
Requires: mvn(org.slf4j:slf4j-jdk14) Requires: slf4j
Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 Requires: slf4j-jdk14
Requires: jss >= 4.11.0, jss < 5.0.0
Obsoletes: ldapjdk < %{version}-%{release} Obsoletes: ldapjdk < %{version}-%{release}
Provides: ldapjdk = %{version}-%{release} Provides: ldapjdk = %{version}-%{release}
@ -112,88 +113,87 @@ Javadoc for LDAP SDK
%prep %prep
################################################################################ ################################################################################
%autosetup -n ldap-sdk-%{version}%{?phase:-}%{?phase} -p 1 %autosetup -n ldap-sdk-%{version}%{?_phase} -p 1
# flatten-maven-plugin is not available in RPM # Remove all bundled jars, we must build against build-system jars
%pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar
# specify Maven artifact locations
%mvn_file org.dogtagpki.ldap-sdk:ldapjdk ldapjdk/ldapjdk ldapjdk
%mvn_file org.dogtagpki.ldap-sdk:ldapbeans ldapjdk/ldapbeans ldapbeans
%mvn_file org.dogtagpki.ldap-sdk:ldapfilter ldapjdk/ldapfilter ldapfilt
%mvn_file org.dogtagpki.ldap-sdk:ldapsp ldapjdk/ldapsp ldapsp
%mvn_file org.dogtagpki.ldap-sdk:ldaptools ldapjdk/ldaptools ldaptools
################################################################################ ################################################################################
%build %build
################################################################################ ################################################################################
export JAVA_HOME=%{java_home} pushd java-sdk/ldapjdk/lib
build-jar-repository -s -p . jss
popd
%mvn_build ln -s /usr/lib/jvm-exports/java/{jsse,jaas,jndi}.jar java-sdk/ldapjdk/lib
pushd java-sdk
export JAVA_HOME=%{java_home}
sh -x ant dist
popd
################################################################################ ################################################################################
%install %install
################################################################################ ################################################################################
%mvn_install install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 java-sdk/dist/packages/ldapjdk.jar $RPM_BUILD_ROOT%{_javadir}/ldapjdk.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
ln -sf %{name}/ldapjdk.pom %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom mkdir -p %{buildroot}%{_mavenpomdir}
ln -sf %{name}/ldapsp.pom %{buildroot}%{_mavenpomdir}/JPP-ldapsp.pom install -pm 644 java-sdk/ldapjdk/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom
ln -sf %{name}/ldapfilter.pom %{buildroot}%{_mavenpomdir}/JPP-ldapfilter.pom install -pm 644 java-sdk/ldapfilter/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapfilter.pom
ln -sf %{name}/ldapbeans.pom %{buildroot}%{_mavenpomdir}/JPP-ldapbeans.pom install -pm 644 java-sdk/ldapbeans/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapbeans.pom
ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom install -pm 644 java-sdk/ldapsp/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapsp.pom
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk
cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk
################################################################################ ################################################################################
%files -n %{product_id} -f .mfiles %files -n %{product_id}
################################################################################ ################################################################################
%{_javadir}/ldapjdk.jar
%{_javadir}/%{spname}*.jar
%{_javadir}/%{filtname}*.jar
%{_javadir}/%{beansname}*.jar
%{_mavenpomdir}/JPP-ldapjdk.pom %{_mavenpomdir}/JPP-ldapjdk.pom
%{_mavenpomdir}/JPP-ldapsp.pom %{_mavenpomdir}/JPP-ldapsp.pom
%{_mavenpomdir}/JPP-ldapfilter.pom %{_mavenpomdir}/JPP-ldapfilter.pom
%{_mavenpomdir}/JPP-ldapbeans.pom %{_mavenpomdir}/JPP-ldapbeans.pom
%{_mavenpomdir}/JPP-ldaptools.pom
################################################################################ ################################################################################
%files -n %{product_id}-javadoc -f .mfiles-javadoc %files -n %{product_id}-javadoc
################################################################################ ################################################################################
%dir %{_javadocdir}/ldapjdk
%{_javadocdir}/ldapjdk/*
################################################################################ ################################################################################
%changelog %changelog
* Wed Feb 21 2024 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.5.0-1 * Thu Feb 08 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.24.0-1
- Rebase to LDAP SDK 5.5.0 - Rebase to LDAP SDK 4.24.0
* Thu Dec 07 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.5.0-0.1.alpha4 * Tue Jan 16 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.24.0-0.1
- Rebase to LDAP SDK 5.5.0-alpha4 - Rebase to LDAP SDK 4.24.0-alpha1
* Mon Jun 05 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.4.0-1 * Mon Jul 26 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 4.23.0-1
- Rebase to LDAP SDK 5.4.0 - Rebase to LDAP SDK 4.23.0
* Fri Feb 10 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.3.0-1 * Fri Jun 11 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 4.23.0-0.1
- Rebase to LDAP SDK 5.3.0 - Rebase to LDAP SDK 4.23.0-alpha1
* Wed Nov 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.3.0-0.2.beta1 * Tue May 26 2020 Red Hat PKI Team <rhcs-maint@redhat.com> 4.22.0-1
- Rebase to LDAP SDK 5.3.0-beta1 - Rebase to LDAP SDK 4.22.0
* Thu Jun 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-1 * Thu Oct 31 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 4.21.0-2
- Rebase to LDAP SDK 5.2.0 - Bump min required JSS version to 4.6.0
* Mon May 02 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-0.3.beta2 * Mon Jun 10 2019 Red Hat PKI Team <rhcs-maint@redhat.com> 4.21.0-1
- Rebase to LDAP SDK 5.2.0-beta2 - Rebase to LDAP SDK 4.21.0
- Rename packages to idm-ldapjdk
* Mon Apr 18 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-0.2.beta1 * Fri Aug 10 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 4.20.0-0
- Rebase to LDAP SDK 5.2.0-beta1 - Rebase to LDAP SDK 4.20.0
* Tue Oct 05 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-1
- Rebase to LDAP SDK 5.0.0
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.0.0-0.3.alpha1
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon Aug 2 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.2
- Drop javadoc package
* Fri Jun 25 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.1
- Rebase to LDAP SDK 5.0.0-alpha1