Rebase to PKI 11.2.0-beta1

.gitignore

@@ -26,3 +26,4 @@
 /pki-11.0.0.tar.gz
 /pki-11.1.0-alpha2.tar.gz
 /pki-11.1.0.tar.gz
+/pki-11.2.0-beta1.tar.gz

dogtag-pki.spec

@@ -13,9 +13,9 @@ 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:          11.1.0
-Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
-#global           _phase -alpha2
+Version:          11.2.0
+Release:          0.2.beta1%{?_timestamp}%{?_commit_id}%{?dist}
+%global           _phase -beta1
 
 # To create a tarball from a version tag:
 # $ git archive \
@@ -188,9 +188,9 @@ BuildRequires:    python3-six
 
 BuildRequires:    junit
 BuildRequires:    jpackage-utils >= 0:1.7.5-10
-BuildRequires:    jss >= 5.1.0
+BuildRequires:    jss >= 5.2.0
 BuildRequires:    tomcatjss >= 8.1.0
-BuildRequires:    ldapjdk >= 5.1.0
+BuildRequires:    ldapjdk >= 5.2.0
 
 BuildRequires:    systemd-units
 
@@ -380,8 +380,8 @@ Requires:         apache-commons-net
 Requires:         slf4j
 Requires:         slf4j-jdk14
 Requires:         jpackage-utils >= 0:1.7.5-10
-Requires:         jss >= 5.1.0
-Requires:         ldapjdk >= 5.1.0
+Requires:         jss >= 5.2.0
+Requires:         ldapjdk >= 5.2.0
 Requires:         %{product_id}-base = %{version}-%{release}
 
 %if 0%{?rhel} && 0%{?rhel} <= 8
@@ -417,6 +417,9 @@ Requires:         openssl
 This package provides tools that can be used to help make
 %{product_name} into a more complete and robust PKI solution.
 
+The utility "tpsclient" is a test tool that interacts with TPS.
+This tool is useful to test TPS server without risking an actual smart card.
+
 # with base
 %endif
 
@@ -648,6 +651,7 @@ behind the firewall with restricted access.
 ################################################################################
 
 Summary:          %{product_name} TPS Package
+BuildArch:        noarch
 
 Obsoletes:        pki-tps < %{version}-%{release}
 Provides:         pki-tps = %{version}-%{release}
@@ -678,10 +682,6 @@ Token Key Service (TKS)) to fulfill the user's requests.
 TPS also interacts with the token database, an LDAP server that stores
 information about individual tokens.
 
-The utility "tpsclient" is a test tool that interacts with TPS.  This
-tool is useful to test TPS server configs without risking an actual
-smart card.
-
 # with tps
 %endif
 
@@ -1046,14 +1046,15 @@ fi
 
 %license base/tools/LICENSE
 %doc base/tools/doc/README
-%{_bindir}/p7tool
 %{_bindir}/p12tool
+%{_bindir}/p7tool
 %{_bindir}/pistool
 %{_bindir}/pki
 %{_bindir}/revoker
 %{_bindir}/setpin
 %{_bindir}/sslget
 %{_bindir}/tkstool
+%{_bindir}/tpsclient
 %{_bindir}/AtoB
 %{_bindir}/AuditVerify
 %{_bindir}/BtoA
@@ -1080,6 +1081,7 @@ fi
 %{_javadir}/pki/pki-tools.jar
 %{_datadir}/pki/tools/
 %{_datadir}/pki/lib/p11-kit-trust.so
+%{_libdir}/tps/libtps.so
 %{_mandir}/man1/AtoB.1.gz
 %{_mandir}/man1/AuditVerify.1.gz
 %{_mandir}/man1/BtoA.1.gz
@@ -1110,6 +1112,7 @@ fi
 %{_mandir}/man1/pki-user-membership.1.gz
 %{_mandir}/man1/PKCS10Client.1.gz
 %{_mandir}/man1/PKICertImport.1.gz
+%{_mandir}/man1/tpsclient.1.gz
 
 # with base
 %endif
@@ -1244,13 +1247,6 @@ fi
 %{_datadir}/pki/tps/
 %{_mandir}/man5/pki-tps-connector.5.gz
 %{_mandir}/man5/pki-tps-profile.5.gz
-%{_mandir}/man1/tpsclient.1.gz
-
-# files for native 'tpsclient'
-# REMINDER:  Remove this comment once 'tpsclient' is rewritten as a Java app
-
-%{_bindir}/tpsclient
-%{_libdir}/tps/libtps.so
 
 # with tps
 %endif
@@ -1322,6 +1318,9 @@ fi
 
 ################################################################################
 %changelog
+* Tue Apr 12 2022 Dogtag PKI Team <devel@lists.dogtagpki.org> - 11.2.0-0.2.beta1
+- Rebase to PKI 11.2.0-beta1
+
 * Mon Feb 14 2022 Dogtag PKI Team <devel@lists.dogtagpki.org> - 11.1.0-1
 - Rebase to PKI 11.1.0
 

sources

@@ -1 +1 @@
-SHA512 (pki-11.1.0.tar.gz) = 2edc28cbf5fe8a80d36bac400dccc9fd1d2fbb167ac7788075858e7af2e50c2a09388fdcd163f49dbb2e5414df8e692031be33a38ec163f31103c181a9b41b0f
+SHA512 (pki-11.2.0-beta1.tar.gz) = f7178276b5c465fb5adb13539dfe1eb8feae31aa8b46cd18d8b7f1036c283493a46aead186f5d2c5f0f5d24931b3fc4c7f6b33bc5c573fe41f657d840cf97330