Sync dogtag-pki spec file

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

dogtag-pki.spec

@@ -173,7 +173,6 @@ BuildRequires:    apache-commons-codec
 BuildRequires:    apache-commons-io
 BuildRequires:    apache-commons-lang3 >= 3.2
 BuildRequires:    apache-commons-net
-BuildRequires:    jakarta-commons-httpclient
 BuildRequires:    glassfish-jaxb-api
 BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
@@ -223,8 +222,13 @@ BuildRequires:    python3-pytest-runner
 
 BuildRequires:    junit
 BuildRequires:    jpackage-utils >= 0:1.7.5-10
-BuildRequires:    jss >= 4.8.0
-BuildRequires:    tomcatjss >= 7.6.0
+BuildRequires:    jss >= 4.8.1
+BuildRequires:    tomcatjss >= 7.6.1
+
+# JNA is used to bind to libsystemd
+%if %{with sdnotify}
+BuildRequires:    jna
+%endif
 BuildRequires:    systemd-units
 
 %if 0%{?rhel}
@@ -394,6 +398,7 @@ Provides:         pki-base-python3 = %{version}
 Requires:         pki-base = %{version}-%{release}
 Requires:         python3 >= 3.5
 Requires:         python3-cryptography
+Requires:         python3-ldap
 Requires:         python3-lxml
 Requires:         python3-nss
 Requires:         python3-requests >= 2.6.0
@@ -416,7 +421,6 @@ Requires:         apache-commons-io
 Requires:         apache-commons-lang3 >= 3.2
 Requires:         apache-commons-logging
 Requires:         apache-commons-net
-Requires:         jakarta-commons-httpclient
 Requires:         glassfish-jaxb-api
 Requires:         slf4j
 Requires:         slf4j-jdk14
@@ -492,7 +496,6 @@ Requires:         keyutils
 
 Requires:         policycoreutils-python-utils
 
-Requires:         python3-ldap
 Requires:         python3-lxml
 Requires:         python3-libselinux
 Requires:         python3-policycoreutils
@@ -512,11 +515,10 @@ Requires(post):   systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
 Requires(pre):    shadow-utils
-Requires:         tomcatjss >= 7.6.0
+Requires:         tomcatjss >= 7.6.1
 
 # JNA is used to bind to libsystemd
 %if %{with sdnotify}
-BuildRequires:    jna
 Requires:         jna
 %endif
 
@@ -875,12 +877,18 @@ cd build
     -DNSS_DEFAULT_DB_TYPE=%{nss_default_db_type} \
     -DBUILD_PKI_CORE:BOOL=ON \
     -DPYTHON_EXECUTABLE=%{python_executable} \
-    -DWITH_TEST:BOOL=%{?with_test:ON}%{!?with_test:OFF} \
 %if ! %{with server} && ! %{with acme} && ! %{with ca} && ! %{with kra} && ! %{with ocsp} && ! %{with tks} && ! %{with tps}
     -DWITH_SERVER:BOOL=OFF \
 %endif
+    -DWITH_CA:BOOL=%{?with_ca:ON}%{!?with_ca:OFF} \
+    -DWITH_KRA:BOOL=%{?with_kra:ON}%{!?with_kra:OFF} \
+    -DWITH_OCSP:BOOL=%{?with_ocsp:ON}%{!?with_ocsp:OFF} \
+    -DWITH_TKS:BOOL=%{?with_tks:ON}%{!?with_tks:OFF} \
+    -DWITH_TPS:BOOL=%{?with_tps:ON}%{!?with_tps:OFF} \
+    -DWITH_ACME:BOOL=%{?with_acme:ON}%{!?with_acme:OFF} \
     -DWITH_SYSTEMD_NOTIFICATION:BOOL=%{?with_sdnotify:ON}%{!?with_sdnotify:OFF} \
     -DWITH_JAVADOC:BOOL=%{?with_javadoc:ON}%{!?with_javadoc:OFF} \
+    -DWITH_TEST:BOOL=%{?with_test:ON}%{!?with_test:OFF} \
     -DBUILD_PKI_CONSOLE:BOOL=%{?with_console:ON}%{!?with_console:OFF} \
     -DTHEME=%{?with_theme:%{vendor_id}} \
 %if 0%{?rhel}