diff --git a/.gitignore b/.gitignore index a878baa..dfa1e6e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,17 @@ 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 +/ldap-sdk-5.0.0-alpha1.tar.gz +/ldap-sdk-5.0.0-alpha2.tar.gz +/ldap-sdk-5.0.0.tar.gz +/ldap-sdk-5.1.0.tar.gz +/ldap-sdk-5.2.0-beta1.tar.gz +/ldap-sdk-5.2.0-beta2.tar.gz +/ldap-sdk-5.2.0.tar.gz +/ldap-sdk-5.3.0.tar.gz +/ldap-sdk-5.4.1.tar.gz +/ldap-sdk-5.5.0-alpha2.tar.gz +/ldap-sdk-5.5.0.tar.gz +/ldap-sdk-5.6.0-alpha1.tar.gz +/ldap-sdk-5.6.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..d982622 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,30 @@ +--- +# See the documentation for more information: +# https://packit.dev/docs/configuration/ +specfile_path: ldapjdk.spec + +# add or remove files that should be synced +files_to_sync: + - ldapjdk.spec + - .packit.yaml + +# Allow dist git reactions on packit and ckelley commits and PRs +allowed_pr_authors: + - packit + - ckelleyRH +allowed_committers: + - packit + - ckelleyRH + +upstream_package_name: ldap-sdk +# downstream (Fedora/CentOS) RPM package name +downstream_package_name: ldapjdk +# see: https://packit.dev/docs/configuration/#upstream_tag_template +upstream_tag_template: "v{version}" + +jobs: + - job: propose_downstream + trigger: release + dist_git_branches: + - fedora-development +# - centos-stream-9-x86_64 # When Packit integration with CentOS is avaiable, enable this diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..07bc213 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.76.0.post10+g0dcb396. diff --git a/ldapjdk.spec b/ldapjdk.spec index c9be9a9..eb973a8 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -2,19 +2,33 @@ Name: ldapjdk ################################################################################ +%global vendor_id dogtag +%global product_id %{vendor_id}-ldapjdk + +# Upstream version number: +%global major_version 5 +%global minor_version 6 +%global update_version 0 + +# Downstream release number: +# - development/stabilization (unsupported): 0. where n >= 1 +# - GA/update (supported): where n >= 1 +%global release_number 1 + +# Development phase: +# - development (unsupported): alpha where n >= 1 +# - stabilization (unsupported): beta where n >= 1 +# - GA/update (supported): +#global phase alpha1 + +%undefine timestamp +%undefine commit_id + Summary: LDAP SDK -URL: http://www.dogtagpki.org/ -License: MPLv1.1 or GPLv2+ or LGPLv2+ - -BuildArch: noarch - -Version: 4.22.0 -Release: 3%{?_timestamp}%{?_commit_id}%{?dist} -# global _phase -a1 - -%global spname ldapsp -%global filtname ldapfilt -%global beansname ldapbeans +URL: https://github.com/dogtagpki/ldap-sdk +License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later +Version: %{major_version}.%{minor_version}.%{update_version} +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -22,7 +36,7 @@ Release: 3%{?_timestamp}%{?_commit_id}%{?dist} # --prefix ldap-sdk-/ \ # -o ldap-sdk-.tar.gz \ # -Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap-sdk-%{version}%{?_phase}.tar.gz +Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?phase}/ldap-sdk-%{version}%{?phase:-}%{?phase}.tar.gz # To create a patch for all changes since a version tag: # $ git format-patch \ @@ -31,148 +45,206 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap # > ldap-sdk-VERSION-RELEASE.patch # Patch: ldap-sdk-VERSION-RELEASE.patch +BuildArch: noarch +%if 0%{?java_arches:1} +ExclusiveArch: %{java_arches} noarch +%endif + +################################################################################ +# Java +################################################################################ + +%define java_devel java-25-openjdk-devel +%define java_headless java-25-openjdk-headless +%define java_home %{_jvmdir}/jre-25-openjdk +%define maven_local maven-local-openjdk25 + ################################################################################ # 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 - +BuildRequires: ant-openjdk25 +BuildRequires: %{java_devel} +BuildRequires: %{maven_local} +BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.slf4j:slf4j-jdk14) +BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 %description The Mozilla LDAP SDKs enable you to write applications which access, manage, and update the information stored in an LDAP directory. +################################################################################ +%package -n %{product_id} +################################################################################ + +Summary: LDAP SDK + +Requires: %{java_headless} +Requires: mvn(org.slf4j:slf4j-api) +Requires: mvn(org.slf4j:slf4j-jdk14) +Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 + +Obsoletes: ldapjdk < %{version}-%{release} +Provides: ldapjdk = %{version}-%{release} +Provides: ldapjdk = %{major_version}.%{minor_version} +Provides: %{product_id} = %{major_version}.%{minor_version} + +%description -n %{product_id} +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 +%package -n %{product_id}-javadoc ################################################################################ -Summary: Javadoc for %{name} +Summary: Javadoc for LDAP SDK -%description javadoc -Javadoc for %{name} +Obsoletes: ldapjdk-javadoc < %{version}-%{release} +Provides: ldapjdk-javadoc = %{version}-%{release} +Provides: ldapjdk-javadoc = %{major_version}.%{minor_version} +Provides: %{product_id}-javadoc = %{major_version}.%{minor_version} + +%description -n %{product_id}-javadoc +Javadoc for LDAP SDK ################################################################################ %prep ################################################################################ -%autosetup -n ldap-sdk-%{version}%{?_phase} -p 1 -S git +%autosetup -n ldap-sdk-%{version}%{?phase:-}%{?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 +# flatten-maven-plugin is not available in RPM +%pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin + +# 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 ################################################################################ -# 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 +export JAVA_HOME=%{java_home} + +%mvn_build ################################################################################ %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 +%mvn_install -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} +ln -sf %{name}/ldapjdk.pom %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom +ln -sf %{name}/ldapsp.pom %{buildroot}%{_mavenpomdir}/JPP-ldapsp.pom +ln -sf %{name}/ldapfilter.pom %{buildroot}%{_mavenpomdir}/JPP-ldapfilter.pom +ln -sf %{name}/ldapbeans.pom %{buildroot}%{_mavenpomdir}/JPP-ldapbeans.pom +ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ -%files -f .mfiles +%files -n %{product_id} -f .mfiles ################################################################################ -%{_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 +%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ -%files javadoc +%files -n %{product_id}-javadoc -f .mfiles-javadoc ################################################################################ -%dir %{_javadocdir}/%{name} -%{_javadocdir}/%{name}/* - ################################################################################ %changelog -* Tue Jul 28 2020 Fedora Release Engineering - 4.22.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Tue Nov 04 2025 Dogtag PKI Team - 5.6.0-1 +- Rebase to LDAP SDK 5.6.0 -* Fri Jul 10 2020 Jiri Vanek - 4.22.0-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 +* Wed Jul 30 2025 Yaakov Selkowitz - 5.6.0-0.1.alpha1.4 +- Really rebuilt for java-25-openjdk as system jdk -* Wed Jun 10 2020 Dogtag PKI Team - 4.22.0-1 -- Rebase to match latest upstream version: 4.22.0 +* Tue Jul 29 2025 jiri vanek - 5.6.0-0.1.alpha1.3 +- Rebuilt for java-25-openjdk as preffered jdk -* Wed Jan 29 2020 Fedora Release Engineering - 4.21.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Thu Jul 24 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Thu Aug 08 2019 Dogtag PKI Team 4.21.0-2 -- Bump min required JSS version to 4.6.0 +* Fri Jan 17 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild -* Thu Aug 08 2019 Dogtag PKI Team 4.21.0-1 -- Rebased to LDAP SDK 4.21.0 +* Wed Nov 20 2024 Dogtag PKI Team 5.5.0-0.1 +- Rebase to LDAP SDK 5.6.0-alpha1 -* Thu Jul 25 2019 Fedora Release Engineering - 4.20.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Thu Jul 18 2024 Fedora Release Engineering - 5.5.0-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild -* Fri Feb 01 2019 Fedora Release Engineering - 4.20.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Sun Mar 03 2024 Yaakov Selkowitz - 5.5.0-2 +- Really rebuilt for java-21-openjdk as system jdk -* Fri Aug 10 2018 Dogtag PKI Team 4.20.0-1 -- Rebased to LDAP SDK 4.20.0 +* Tue Feb 27 2024 Jiri Vanek - 5.5.0-1.1 +- Rebuilt for java-21-openjdk as system jdk +* Wed Feb 21 2024 Dogtag PKI Team 5.5.0-1 +- Rebase to LDAP SDK 5.5.0 + +* Thu Jan 25 2024 Fedora Release Engineering - 5.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 5.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 5.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 16 2023 Packit - 5.4.1-1 +- Updating version to v5.4.1 (Chris Kelley) +- Upstream some spec file changes from Fedora to minimise diff (Chris Kelley) +- Introduce Packit configuration for ldapjdk (Chris Kelley) + +* Tue Feb 07 2023 Dogtag PKI Team - 5.3.0-1 +- Rebase to LDAP SDK 5.3.0 + +* Thu Jan 19 2023 Fedora Release Engineering - 5.2.0-1.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 5.2.0-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 5.2.0-1.1 +- Rebuilt for Drop i686 JDKs + +* Thu Jun 30 2022 Dogtag PKI Team - 5.2.0-1 +- Rebase to LDAP SDK 5.2.0 + +* Fri Apr 29 2022 Dogtag PKI Team - 5.2.0-0.3.beta2 +- Rebase to LDAP SDK 5.2.0-beta2 +- Rename packages to dogtag-ldapjdk + +* Mon Apr 11 2022 Dogtag PKI Team - 5.2.0-0.2.beta1 +- Rebase to LDAP SDK 5.2.0-beta1 + +* Mon Feb 14 2022 Dogtag PKI Team - 5.1.0-1 +- Rebase to LDAP SDK 5.1.0 + +* Sat Feb 05 2022 Jiri Vanek - 5.0.0-3 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 5.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Sep 30 2021 Dogtag PKI Team - 5.0.0-1 +- Rebase to LDAP SDK 5.0.0 + +* Thu Aug 12 2021 Dogtag PKI Team - 5.0.0-0.3.alpha2 +- Rebase to LDAP SDK 5.0.0-alpha2 + +* Thu Jul 22 2021 Fedora Release Engineering - 5.0.0-0.2.alpha1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 22 2021 Dogtag PKI Team - 5.0.0-0.1.alpha1 +- Rebase to LDAP SDK 5.0.0-alpha1 diff --git a/sources b/sources index 05d2bd1..fc04926 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-4.22.0.tar.gz) = 5f8d2a2c0042f281e054cfd3dc1604a5038a77b175268b415cd708031940064b62ec41043bc49d25fdd860aaaaa2a2de95a0c92c409951bfac21770c2d4ff1be +SHA512 (ldap-sdk-5.6.0.tar.gz) = 4e86246ecd0a772a09cfc09081319d4e32abd173ce167cfe7c569636d3bd323b75d1d90d9faf65b43ca67c4e123bfb5bff2620158fff3b011c580e6eca07515d