diff --git a/.gitignore b/.gitignore index 4f61773..dc8cfc7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ ldapjdk-4.18.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 diff --git a/ldapjdk.spec b/ldapjdk.spec index c3939be..b3ffed6 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -2,17 +2,33 @@ Name: ldapjdk ################################################################################ +%global product_id dogtag-ldapjdk + +# Upstream version number: +%global major_version 5 +%global minor_version 2 +%global update_version 0 + +# Downstream release number: +# - development/stabilization (unsupported): 0. where n >= 1 +# - GA/update (supported): where n >= 1 +%global release_number 0.3 + +# Development phase: +# - development (unsupported): alpha where n >= 1 +# - stabilization (unsupported): beta where n >= 1 +# - GA/update (supported): +%global phase beta2 + +%undefine timestamp +%undefine commit_id + Summary: LDAP SDK URL: http://www.dogtagpki.org/ License: MPLv1.1 or GPLv2+ or LGPLv2+ - BuildArch: noarch - -# For development (i.e. unsupported) releases, use x.y.z-0.n.. -# For official (i.e. supported) releases, use x.y.z-r where r >=1. -Version: 5.2.0 -Release: 0.2.beta1%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -beta1 +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 \ @@ -20,7 +36,7 @@ Release: 0.2.beta1%{?_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 \ @@ -46,38 +62,50 @@ BuildRequires: %{java_devel} BuildRequires: javapackages-local BuildRequires: slf4j BuildRequires: slf4j-jdk14 -BuildRequires: jss >= 5.1.0 +BuildRequires: jss >= 5.2.0 + +%description +The Mozilla LDAP SDKs enable you to write applications which access, +manage, and update the information stored in an LDAP directory. ################################################################################ -# Runtime Dependencies +%package -n %{product_id} ################################################################################ +Summary: LDAP SDK + Requires: %{java_headless} Requires: jpackage-utils >= 0:1.5 Requires: slf4j Requires: slf4j-jdk14 -Requires: jss >= 5.1.0 +Requires: jss >= 5.2.0 -%description +Obsoletes: ldapjdk < %{version}-%{release} +Provides: ldapjdk = %{version}-%{release} + +%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 LDAP SDK +Summary: Javadoc for LDAP SDK -%description javadoc +Obsoletes: ldapjdk-javadoc < %{version}-%{release} +Provides: ldapjdk-javadoc = %{version}-%{release} + +%description -n %{product_id}-javadoc Javadoc for LDAP SDK ################################################################################ %prep ################################################################################ -%autosetup -n ldap-sdk-%{version}%{?_phase} -p 1 +%autosetup -n ldap-sdk-%{version}%{?phase:-}%{?phase} -p 1 ################################################################################ %build @@ -103,7 +131,7 @@ export JAVA_HOME=%{java_home} install ################################################################################ -%files +%files -n %{product_id} ################################################################################ %{_javadir}/ldapjdk.jar @@ -116,7 +144,7 @@ export JAVA_HOME=%{java_home} %{_mavenpomdir}/JPP-ldapbeans.pom ################################################################################ -%files javadoc +%files -n %{product_id}-javadoc ################################################################################ %dir %{_javadocdir}/ldapjdk @@ -124,6 +152,10 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* 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 diff --git a/sources b/sources index 2ec557c..f638e39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.2.0-beta1.tar.gz) = dfd19dc06d77e57312f7876d82db9edc8416ac0cf279a276290470d8fc0053e578dfc9d2dc605d798b5719f252ab132a1cc570958cffd9bd0c225a2ad1ab16ad +SHA512 (ldap-sdk-5.2.0-beta2.tar.gz) = 4d53a81e342b227b8acfac22d1f0d7e95361c55950dbdb14c1674e8192e7c36e5fe434e0e1529d8abf9de9992572c179f434b7d6df54dddde34c57529522faaf