import pki-core-10.12.0-0.1.module+el8.6.0+13291+248751b1

.gitignore

@@ -1 +1 @@
-SOURCES/pki-10.11.2.tar.gz
+SOURCES/pki-10.12.0.tar.gz

.pki-core.metadata

@@ -1 +1 @@
-864e86742b5462527a677c060d5b3b1d0f11b299 SOURCES/pki-10.11.2.tar.gz
+14942c7bda42ccd0f57ea5b2e538eb13a559572f SOURCES/pki-10.12.0.tar.gz

SOURCES/0001-Fix-Bug-2001576-pki-instance-creation-fails-for-IPA-.patch

@@ -1,26 +0,0 @@
-From 607300e57ea05a1475656f1493745f7c7a28b747 Mon Sep 17 00:00:00 2001
-From: Jack Magne <jmagne@redhat.com>
-Date: Thu, 23 Sep 2021 13:50:41 -0400
-Subject: [PATCH] Fix Bug 2001576 - pki instance creation fails for IPA server
- in FIPS mode (RHEL-8.5). Additional fix to this issue to account for our
- standalone java tools.
-
----
- base/tools/templates/pki_java_command_wrapper.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/base/tools/templates/pki_java_command_wrapper.in b/base/tools/templates/pki_java_command_wrapper.in
-index 05650630d..d68ed93a3 100644
---- a/base/tools/templates/pki_java_command_wrapper.in
-+++ b/base/tools/templates/pki_java_command_wrapper.in
-@@ -90,6 +90,7 @@ JAVA_OPTIONS=""
- 
- ${JAVA} ${JAVA_OPTIONS} \
-   -cp "${PKI_LIB}/*" \
-+  -Dcom.redhat.fips=false \
-   -Djava.util.logging.config.file=${PKI_LOGGING_CONFIG} \
-   com.netscape.cmstools.${COMMAND} "$@"
- 
--- 
-2.31.1
-

SPECS/pki-core.spec

@@ -12,10 +12,11 @@ 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.
-Version:          10.11.2
-Release:          2%{?_timestamp}%{?_commit_id}%{?dist}
+Version:          10.12.0
+Release:          0.1%{?_timestamp}%{?_commit_id}%{?dist}
 #global           _phase -alpha1
 
+
 # To create a tarball from a version tag:
 # $ git archive \
 #     --format=tar.gz \
@@ -30,7 +31,6 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver
 #     <version tag> \
 #     > pki-VERSION-RELEASE.patch
 # Patch: pki-VERSION-RELEASE.patch
-Patch1: 0001-Fix-Bug-2001576-pki-instance-creation-fails-for-IPA-.patch
 
 # md2man isn't available on i686. Additionally, we aren't generally multi-lib
 # compatible (https://fedoraproject.org/wiki/Packaging:Java)
@@ -356,6 +356,9 @@ symmetric key operations to Java programs.
 Summary:          PKI Base Package
 BuildArch:        noarch
 
+Obsoletes:        pki-base < %{version}-%{release}
+Provides:         pki-base = %{version}-%{release}
+
 Requires:         nss >= 3.36.1
 
 Requires:         python3-pki = %{version}-%{release}
@@ -380,6 +383,7 @@ BuildArch:        noarch
 
 Obsoletes:        pki-base-python3 < %{version}
 Provides:         pki-base-python3 = %{version}-%{release}
+
 %if 0%{?fedora} || 0%{?rhel} > 8
 %{?python_provide:%python_provide python3-pki}
 %endif
@@ -405,6 +409,9 @@ This package contains PKI client library for Python 3.
 Summary:          PKI Base Java Package
 BuildArch:        noarch
 
+Obsoletes:        pki-base-java < %{version}-%{release}
+Provides:         pki-base-java = %{version}-%{release}
+
 Requires:         %{java_headless}
 Requires:         apache-commons-cli
 Requires:         apache-commons-codec
@@ -473,6 +480,9 @@ Certificate System into a more complete and robust PKI solution.
 Summary:          PKI Server Package
 BuildArch:        noarch
 
+Obsoletes:        pki-server < %{version}-%{release}
+Provides:         pki-server = %{version}-%{release}
+
 Requires:         hostname
 
 Requires:         policycoreutils
@@ -726,6 +736,9 @@ smart card.
 Summary:          PKI Javadoc Package
 BuildArch:        noarch
 
+Obsoletes:        pki-javadoc < %{version}-%{release}
+Provides:         pki-javadoc = %{version}-%{release}
+
 # Ensure we end up with a useful installation
 Conflicts:        pki-base < %{version}
 Conflicts:        pki-symkey < %{version}
@@ -746,6 +759,9 @@ This package contains PKI API documentation.
 Summary:          PKI Console Package
 BuildArch:        noarch
 
+Obsoletes:        pki-console < %{version}-%{release}
+Provides:         pki-console = %{version}-%{release}
+
 BuildRequires:    idm-console-framework >= 1.2.0
 
 Requires:         idm-console-framework >= 1.2.0
@@ -766,6 +782,7 @@ The PKI Console is a Java application used to administer PKI server.
 Summary:          %{brand} PKI Server Theme Package
 BuildArch:        noarch
 
+Obsoletes:        pki-server-theme < %{version}-%{release}
 Provides:         pki-server-theme = %{version}-%{release}
 
 # Ensure we end up with a useful installation
@@ -785,6 +802,7 @@ This PKI Server Theme Package contains
 Summary:          %{brand} PKI Console Theme Package
 BuildArch:        noarch
 
+Obsoletes:        pki-console-theme < %{version}-%{release}
 Provides:         pki-console-theme = %{version}-%{release}
 
 # Ensure we end up with a useful installation
@@ -1363,11 +1381,13 @@ fi
 
 ################################################################################
 %changelog
-* Fri Sep 24 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 10.11.2-2
-- Bug 2001576 - pki instance creation fails for IPA in FIPS mode
-
-* Fri Sep 17 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 10.11.2-1
-- Rebase to PKI 10.11.2
+* Tue Nov 09 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 10.12.0-1
+- Rebase to PKI 10.12.0
+- Bug 1904112 - pki fails to start if empty dir /var/lib/pki/pki-tomcat/kra exists
+- Bug 1984455 - [RFE] Date Format on the TPS Agent Page
+- Bug 1980378 - 'keyctl_search: Required key not available' message when running 'ipa-healthcheck'
+- Bug 2004084 - Reinstall of the same ipa-replica fails with 'RuntimeError: CA configuration failed.'
+- Bug 2006070 - Upgrades incorrectly add secret attribute to connectors
 
 * Thu Aug 12 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 10.11.0-2
 - Bug 1992337 - Double issuance of non-CA subsystem certs at installation