From eebdf04859ba7a58780441c1bec63e6ab1d56c85 Mon Sep 17 00:00:00 2001
From: Ade Lee <alee@redhat.com>
Date: Thu, 23 Apr 2015 13:47:24 -0400
Subject: Remove duplicate prompt on nuxwdog startup

---
 specs/dogtag-pki.spec | 29 ++---------------------------
 specs/pki-core.spec   | 22 +++-------------------
 2 files changed, 5 insertions(+), 46 deletions(-)

(limited to 'specs')

diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec
index 03a59d855..c602fc7e0 100644
--- a/specs/dogtag-pki.spec
+++ b/specs/dogtag-pki.spec
@@ -16,35 +16,8 @@ ExcludeArch:      ppc ppc64 ppcle ppc64le s390 s390x
 %define dogtag_pki_theme_version   %{version}
 %define esc_version                1.1.0
 # NOTE:  The following package versions are TLS compliant:
-%define jss_version                4.2.6-35
 %define pki_core_version           %{version}
 %define pki_console_version        %{version}
-%if 0%{?rhel}
-%define tomcatjss_version          7.1.0-5
-%else
-%if 0%{?fedora} >= 23
-%define tomcatjss_version          7.1.2
-%else
-%define tomcatjss_version          7.1.1
-%endif
-%endif
-
-Requires:         apache-commons-codec
-%if  0%{?fedora} >= 21
-Requires:         selinux-policy-targeted >= 3.13.1-9
-%else
-# 0%{?rhel} || 0%{?fedora} < 21
-Requires:         selinux-policy-targeted >= 3.12.1-153
-%endif
-
-# Make certain that this 'meta' package requires the latest version(s)
-# of ALL top-level Dogtag PKI support packages
-Requires:         jss >= %{jss_version}
-Requires:         tomcatjss >= %{tomcatjss_version}
-
-# Make certain that this 'meta' package requires the latest version(s)
-# of ALL top-level Dogtag PKI support javadocs
-Requires:         jss-javadoc >= %{jss_version}
 
 # Make certain that this 'meta' package requires the latest version(s)
 # of ALL Dogtag PKI theme packages
@@ -122,6 +95,8 @@ rm -rf %{buildroot}
 %changelog
 * Thu Apr 23 2015 Dogtag Team <pki-devel@redhat.com> 10.2.3-1
 - Update release number for release build
+- Remove tomcatjss, jss and selinux requirements as these should
+  be handled by pki packages
 
 * Thu Apr  9 2015 Dogtag Team <pki-devel@redhat.com> 10.2.3-0.1
 - Reverted version number back to 10.2.3-0.1
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 30bd9093f..30b117986 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -53,7 +53,7 @@ BuildRequires:    apache-commons-lang
 BuildRequires:    jakarta-commons-httpclient
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel >= 3.14.3
-BuildRequires:    nuxwdog-client-java
+BuildRequires:    nuxwdog-client-java >= 1.0.2
 BuildRequires:    openldap-devel
 BuildRequires:    pkgconfig
 BuildRequires:    policycoreutils
@@ -101,15 +101,7 @@ BuildRequires:    junit
 BuildRequires:    jpackage-utils >= 0:1.7.5-10
 BuildRequires:    jss >= 4.2.6-35
 BuildRequires:    systemd-units
-%if 0%{?rhel}
-BuildRequires:    tomcatjss >= 7.1.0-5
-%else
-%if 0%{?fedora} >= 23
-BuildRequires:         tomcatjss >= 7.1.2
-%else
-BuildRequires:         tomcatjss >= 7.1.1
-%endif
-%endif
+BuildRequires:    tomcatjss >= 7.1.2
 
 # additional build requirements needed to build native 'tpsclient'
 # REMINDER:  Revisit these once 'tpsclient' is rewritten as a Java app
@@ -354,7 +346,7 @@ Obsoletes:        pki-silent < %{version}-%{release}
 
 Requires:         java-headless >= 1:1.7.0
 Requires:         net-tools
-Requires:         nuxwdog-client-java
+Requires:         nuxwdog-client-java >= 1.0.2
 Requires:         perl(File::Slurp)
 Requires:         policycoreutils
 Requires:         openldap-clients
@@ -390,15 +382,7 @@ Requires(post):   systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
 
-%if 0%{?rhel}
-Requires:         tomcatjss >= 7.1.0-5
-%else
-%if 0%{?fedora} >= 23
 Requires:         tomcatjss >= 7.1.2
-%else
-Requires:         tomcatjss >= 7.1.1
-%endif
-%endif
 
 %description -n   pki-server
 The PKI Server Framework is required by the following four PKI subsystems:
-- 
cgit