From ba2d827661a6f7e780ede7813f99a3960dca48bf Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Aug 18 2020 12:21:05 +0000
Subject: Add missing subpackages again


Signed-off-by: Alexander Scheel <ascheel@redhat.com>

---

diff --git a/pki-core.spec b/pki-core.spec
index 4ed8ee5..e687ac1 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -11,7 +11,7 @@ URL:              http://www.dogtagpki.org/
 License:          GPLv2 and LGPLv2
 
 Version:          10.9.1
-Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
+Release:          2%{?_timestamp}%{?_commit_id}%{?dist}
 #global           _phase -a1
 
 # To create a tarball from a version tag:
@@ -101,19 +101,19 @@ Patch1: 0001-Support-FIPS-HSMs.patch
 # Define --with <package> or --without <package> options depending on
 # package selection method.
 
-%package_option base
-%package_option server
-%package_option ca
-%package_option kra
-%package_option ocsp
-%package_option tks
-%package_option tps
-%package_option javadoc
-%package_option console
-%package_option theme
-%package_option meta
-%package_option tests
-%package_option debug
+%global with_base 1
+%global with_server 1
+%global with_ca 1
+%global with_kra 1
+%global with_ocsp 1
+%global with_tks 1
+%global with_tps 1
+%global with_javadoc 1
+%global with_console 1
+%global without_theme 1
+%global without_meta 1
+%global without_tests 1
+%global with_debug 1
 
 %if ! %{with debug}
 %define debug_package %{nil}
@@ -1326,6 +1326,9 @@ fi
 
 ################################################################################
 %changelog
+* Tue Aug 18 2020 Dogtag PKI Team <pki-devel@redhat.com> - 10.9.1-2
+- Rebuilt to fix packaging issues introduced upstream
+
 * Mon Aug 17 2020 Dogtag PKI Team <pki-devel@redhat.com> - 10.9.1-1
 - Rebuilt with v10.9.1 and patches to fix JDK11 build issues