From f5c0015215215e4870ccb2ba301a2a283080d18b Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Tue, 16 Jan 2024 14:33:07 +0700
Subject: [PATCH] Rebase to PKI 10.15.0-alpha1

Resolves: https://issues.redhat.com/browse/RHEL-12765
---
 .gitignore    |  1 +
 pki-core.spec | 28 +++++++++++++++-------------
 sources       |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 30f95fe..66ff31d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 SOURCES/pki-10.14.3.tar.gz
 /pki-10.14.3.tar.gz
+/pki-10.15.0-alpha1.tar.gz
diff --git a/pki-core.spec b/pki-core.spec
index 06d994a..8bff5c2 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -12,10 +12,10 @@ License:          GPLv2 and LGPLv2
 
 # 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 2
-Version:          10.14.3
+%global           release_number 0.1
+Version:          10.15.0
 Release:          %{?release_number}%{?_timestamp}%{?_commit_id}%{?dist}
-#global           _phase
+%global           _phase -alpha1
 
 # To create a tarball from a version tag:
 # $ git archive \
@@ -34,7 +34,6 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver
 
 # md2man isn't available on i686. Additionally, we aren't generally multi-lib
 # compatible (https://fedoraproject.org/wiki/Packaging:Java)
-# md2man has now also been dropped in RHEL 8 so exlcude from RHEL 8+
 %if ! 0%{?rhel} || 0%{?rhel} >= 8
 ExcludeArch: i686
 %endif
@@ -175,7 +174,7 @@ BuildRequires:    zip
 BuildRequires:    %{java_devel}
 BuildRequires:    javapackages-tools
 BuildRequires:    redhat-rpm-config
-BuildRequires:    ldapjdk >= 4.23.0, ldapjdk < 5.0.0
+BuildRequires:    ldapjdk >= 4.24, ldapjdk < 5.0
 BuildRequires:    apache-commons-cli
 BuildRequires:    apache-commons-codec
 BuildRequires:    apache-commons-io
@@ -214,8 +213,8 @@ BuildRequires:    tomcat >= 1:9.0.83
 
 BuildRequires:    junit
 BuildRequires:    jpackage-utils >= 0:1.7.5-10
-BuildRequires:    jss >= 4.9.0, jss < 5.0.0
-BuildRequires:    tomcatjss >= 7.7.0, tomcatjss < 8.0.0
+BuildRequires:    jss >= 4.10, jss < 5.0
+BuildRequires:    tomcatjss >= 7.8, tomcatjss < 8.0
 
 BuildRequires:    systemd-units
 
@@ -334,7 +333,7 @@ Provides:         pki-symkey = %{version}-%{release}
 
 Requires:         %{java_headless}
 Requires:         jpackage-utils >= 0:1.7.5-10
-Requires:         jss >= 4.9.0, jss < 5.0.0
+Requires:         jss >= 4.10, jss < 5.0
 Requires:         nss >= 3.38.0
 
 # Ensure we end up with a useful installation
@@ -422,8 +421,8 @@ Requires:         glassfish-jaxb-api
 Requires:         slf4j
 Requires:         slf4j-jdk14
 Requires:         jpackage-utils >= 0:1.7.5-10
-Requires:         jss >= 4.9.0, jss < 5.0.0
-Requires:         ldapjdk >= 4.23.0, ldapjdk < 5.0.0
+Requires:         jss >= 4.10, jss < 5.0
+Requires:         ldapjdk >= 4.24, ldapjdk < 5.0
 Requires:         %{product_id}-base = %{version}-%{release}
 
 %if 0%{?rhel} && 0%{?rhel} <= 8
@@ -511,7 +510,7 @@ Requires(post):   systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
 Requires(pre):    shadow-utils
-Requires:         tomcatjss >= 7.7.0, tomcatjss < 8.0.0
+Requires:         tomcatjss >= 7.8, tomcatjss < 8.0
 
 # pki-healthcheck depends on the following library
 %if 0%{?rhel}
@@ -776,9 +775,9 @@ BuildArch:        noarch
 Obsoletes:        pki-console < %{version}-%{release}
 Provides:         pki-console = %{version}-%{release}
 
-BuildRequires:    idm-console-framework >= 1.2.0, idm-console-framework < 2.0.0
+BuildRequires:    idm-console-framework >= 1.4, idm-console-framework < 2.0
 
-Requires:         idm-console-framework >= 1.2.0, idm-console-framework < 2.0.0
+Requires:         idm-console-framework >= 1.4, idm-console-framework < 2.0
 Requires:         %{product_id}-base-java = %{version}-%{release}
 Requires:         %{product_id}-console-theme = %{version}-%{release}
 
@@ -1395,6 +1394,9 @@ fi
 
 ################################################################################
 %changelog
+* Tue Jan 16 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 10.15.0-0.1
+- Rebase to PKI 10.15.0-alpha1
+
 * Mon Jan 15 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 10.14.3-2
 - Replace pki-servlet-engine with tomcat
 
diff --git a/sources b/sources
index f82798d..b04c361 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-10.14.3.tar.gz) = ffdd8240bcbfc1c3cd28fecc4eb092767d8afab2df7a9354264081f9c5449f12eb06726045758515b1a27f32af622dca557cc8d370d6c5f5eaaf8d8117b94773
+SHA512 (pki-10.15.0-alpha1.tar.gz) = 1336905f096ab1d14dfe9a7fd0b8c03ac4e53164e8e2d7a327524b2a79fa1c233aaab0d63469f7dcb0178d6abd9311f6b2bbac03aae6d433590a8f6c78350c3f