From 8d39f597b7df989d8f9448d0474d14e50cac9f7a Mon Sep 17 00:00:00 2001
From: Chris Kelley <ckelley@redhat.com>
Date: Sat, 4 Sep 2021 00:20:10 +0100
Subject: [PATCH] Rebase to PKI 11.0.0-beta1

---
 .gitignore      |  1 +
 dogtag-pki.spec | 12 +++++-------
 sources         |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index df9ca1a..76574a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /pki-10.11.0-alpha2.tar.gz
 /pki-11.0.0-alpha1.tar.gz
 /pki-11.0.0-alpha2.tar.gz
+/pki-11.0.0-beta1.tar.gz
diff --git a/dogtag-pki.spec b/dogtag-pki.spec
index ab412e1..0650e81 100644
--- a/dogtag-pki.spec
+++ b/dogtag-pki.spec
@@ -14,8 +14,8 @@ 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.0.0
-Release:          0.3.alpha2%{?_timestamp}%{?_commit_id}%{?dist}
-%global           _phase -alpha2
+Release:          0.4.beta1%{?_timestamp}%{?_commit_id}%{?dist}
+%global           _phase -beta1
 
 # To create a tarball from a version tag:
 # $ git archive \
@@ -420,15 +420,10 @@ Requires:         %{product_id}-base = %{version}-%{release}
 Requires:         resteasy >= 3.0.26
 %else
 Requires:         resteasy-client >= 3.0.17-1
-Requires:         resteasy-jaxb-provider >= 3.0.17-1
 Requires:         resteasy-core >= 3.0.17-1
 Requires:         resteasy-jackson2-provider >= 3.0.17-1
 %endif
 
-%if 0%{?fedora} >= 33 || 0%{?rhel} > 8
-Requires:         jaxb-impl >= 2.3.3
-%endif
-
 Requires:         xalan-j2
 Requires:         xerces-j2
 Requires:         xml-commons-resolver
@@ -1099,6 +1094,7 @@ fi
 %license base/tools/LICENSE
 %doc base/tools/doc/README
 %{_bindir}/p7tool
+%{_bindir}/p12tool
 %{_bindir}/pistool
 %{_bindir}/pki
 %{_bindir}/revoker
@@ -1374,6 +1370,8 @@ fi
 
 ################################################################################
 %changelog
+* Fri Sep 03 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 11.0.0-0.4.beta1
+- Rebase to PKI 11.0.0-beta1
 * Thu Aug 12 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 11.0.0-0.3.alpha2
 - Rebase to PKI 11.0.0-alpha2
 
diff --git a/sources b/sources
index 111a1f9..2c9d29c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-11.0.0-alpha2.tar.gz) = ea3c01e81bf8f63c7285d26685f6d426c1e5ade7055f7ee3753b1ba705d47fe6bd1c3d1e8879bb78e16890da0e990d54b59bf0b404d2d4cff2384065f9979672
+SHA512 (pki-11.0.0-beta1.tar.gz) = c12380d52562bd9b01ebbce235dc7574ff7224f64cb10e54cea9008e0c0e5fc4f2bcf411ab8720bb99d84736db062aeebfd9609631f72ce7971971745f4f2048