diff --git a/.gitignore b/.gitignore index dfa1e6e..d5b02ce 100644 --- a/.gitignore +++ b/.gitignore @@ -11,9 +11,3 @@ ldapjdk-4.18.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 deleted file mode 100644 index d982622..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# 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 deleted file mode 100644 index 07bc213..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -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 eb973a8..d4281b1 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -2,12 +2,11 @@ Name: ldapjdk ################################################################################ -%global vendor_id dogtag -%global product_id %{vendor_id}-ldapjdk +%global product_id dogtag-ldapjdk # Upstream version number: %global major_version 5 -%global minor_version 6 +%global minor_version 2 %global update_version 0 # Downstream release number: @@ -19,16 +18,18 @@ Name: ldapjdk # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -#global phase alpha1 +%undefine phase %undefine timestamp %undefine commit_id Summary: 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 +ExclusiveArch: %{java_arches} noarch Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.2 # To create a tarball from a version tag: # $ git archive \ @@ -45,30 +46,24 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?p # > 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 +%define java_devel java-17-openjdk-devel +%define java_headless java-17-openjdk-headless +%define java_home %{_jvmdir}/jre-17-openjdk ################################################################################ # Build Dependencies ################################################################################ -BuildRequires: ant-openjdk25 +BuildRequires: ant 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 +BuildRequires: javapackages-local +BuildRequires: slf4j +BuildRequires: slf4j-jdk14 +BuildRequires: jss >= 5.2.0 %description The Mozilla LDAP SDKs enable you to write applications which access, @@ -81,14 +76,13 @@ manage, and update the information stored in an LDAP directory. 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 +Requires: jpackage-utils >= 0:1.5 +Requires: slf4j +Requires: slf4j-jdk14 +Requires: jss >= 5.2.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, @@ -104,8 +98,6 @@ Summary: Javadoc for LDAP SDK 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 @@ -116,102 +108,51 @@ Javadoc for LDAP SDK %autosetup -n ldap-sdk-%{version}%{?phase:-}%{?phase} -p 1 -# 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 ################################################################################ export JAVA_HOME=%{java_home} -%mvn_build +./build.sh \ + %{?_verbose:-v} \ + --work-dir=%{_vpath_builddir} \ + dist ################################################################################ %install ################################################################################ -%mvn_install - -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 +./build.sh \ + %{?_verbose:-v} \ + --work-dir=%{_vpath_builddir} \ + --java-lib-dir=%{_javadir} \ + --javadoc-dir=%{_javadocdir} \ + --install-dir=%{buildroot} \ + install ################################################################################ -%files -n %{product_id} -f .mfiles +%files -n %{product_id} ################################################################################ +%{_javadir}/ldapjdk.jar +%{_javadir}/ldapsp.jar +%{_javadir}/ldapfilt.jar +%{_javadir}/ldapbeans.jar %{_mavenpomdir}/JPP-ldapjdk.pom %{_mavenpomdir}/JPP-ldapsp.pom %{_mavenpomdir}/JPP-ldapfilter.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 -* Tue Nov 04 2025 Dogtag PKI Team - 5.6.0-1 -- Rebase to LDAP SDK 5.6.0 - -* Wed Jul 30 2025 Yaakov Selkowitz - 5.6.0-0.1.alpha1.4 -- Really rebuilt for java-25-openjdk as system jdk - -* Tue Jul 29 2025 jiri vanek - 5.6.0-0.1.alpha1.3 -- Rebuilt for java-25-openjdk as preffered jdk - -* Thu Jul 24 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Nov 20 2024 Dogtag PKI Team 5.5.0-0.1 -- Rebase to LDAP SDK 5.6.0-alpha1 - -* Thu Jul 18 2024 Fedora Release Engineering - 5.5.0-2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sun Mar 03 2024 Yaakov Selkowitz - 5.5.0-2 -- Really rebuilt for java-21-openjdk as system jdk - -* 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 diff --git a/sources b/sources index fc04926..28b54ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.6.0.tar.gz) = 4e86246ecd0a772a09cfc09081319d4e32abd173ce167cfe7c569636d3bd323b75d1d90d9faf65b43ca67c4e123bfb5bff2620158fff3b011c580e6eca07515d +SHA512 (ldap-sdk-5.2.0.tar.gz) = 8799375fac34d2099601827b08c06f14a40f41f4b119bffab9e052cfa16d1b4b9758e231bac220c617ca4e07a32106f21308615a63a23bb66e0f55a1d992c3bb