Remove IPA theme component and old unused UI directories

- PKI TRAC Ticket #1136 - Remove ipa-pki-theme component
- Remove 'ca-ui', 'kra-ui', 'ocsp-ui', 'ra-ui', 'tks-ui', and 'tps-ui' directories
- Consolidate 'pki-core' packages

3 files changed, 31 insertions, 283 deletions

diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec
index 0b4171f1e..e625b1cbf 100644
--- a/specs/dogtag-pki-theme.spec
+++ b/specs/dogtag-pki-theme.spec
@@ -1,6 +1,6 @@
 Name:             dogtag-pki-theme
 Version:          10.2.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Certificate System - Dogtag PKI Theme Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -21,27 +21,11 @@ ExcludeArch:      ppc ppc64 ppcle ppc64le s390 s390x
 %endif
 
 %global overview                                                       \
-Several PKI packages require a "virtual" theme component.  These       \
+Several PKI packages utilize a "virtual" theme component.  These       \
 "virtual" theme components are "Provided" by various theme "flavors"   \
-including "dogtag", "redhat", and "ipa".  Consequently,                \
-all "dogtag", "redhat", and "ipa" theme components MUST be             \
-mutually exclusive!                                                    \
-                                                                       \
-On Fedora systems, the "dogtag" theme packages are the ONLY available  \
-theme components.                                                      \
-                                                                       \
-Similarly, the "ipa" theme packages are ONLY available on RHEL         \
-systems, and represent the default theme components.                   \
-                                                                       \
-Alternatively, on RHEL systems, if the "dogtag" theme packages are     \
-available as EPEL packages, while they may be used as a transparent    \
-replacement for their corresponding "ipa" theme package, they are not  \
-intended to be used as a replacement for their corresponding "redhat"  \
-theme components.                                                      \
-                                                                       \
-Finally, if available for a RHEL system (e. g. - RHCS subscription),   \
-each "redhat" theme package MUST be used as a transparent replacement  \
-for its corresponding "ipa" theme package or "dogtag" theme package.   \
+including "dogtag" or a user customized theme package.  Consequently,  \
+all "dogtag" and any customized theme components MUST be mutually      \
+exclusive!                                                             \
 %{nil}
 
 %description %{overview}
@@ -51,36 +35,6 @@ for its corresponding "ipa" theme package or "dogtag" theme package.   \
 Summary:          Certificate System - PKI Server Framework User Interface
 Group:            System Environment/Base
 
-%if 0%{?rhel}
-# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
-Conflicts:        redhat-pki-server-theme
-Conflicts:        redhat-pki-common-theme
-Conflicts:        redhat-pki-common-ui
-Conflicts:        redhat-pki-ca-theme
-Conflicts:        redhat-pki-ca-ui
-Conflicts:        redhat-pki-kra-theme
-Conflicts:        redhat-pki-kra-ui
-Conflicts:        redhat-pki-ocsp-theme
-Conflicts:        redhat-pki-ocsp-ui
-Conflicts:        redhat-pki-tks-theme
-Conflicts:        redhat-pki-tks-ui
-Conflicts:        redhat-pki-ra-theme
-Conflicts:        redhat-pki-ra-ui
-Conflicts:        redhat-pki-tps-theme
-Conflicts:        redhat-pki-tps-ui
-
-# EPEL version of Dogtag "theme" ALWAYS replaces ALL versions of IPA "theme"
-Obsoletes:        ipa-pki-server-theme <= 9999
-Obsoletes:        ipa-pki-common-theme <= 9999
-Obsoletes:        ipa-pki-ca-theme <= 9999
-Obsoletes:        ipa-pki-kra-theme <= 9999
-
-Provides:         ipa-pki-server-theme = %{version}-%{release}
-Provides:         ipa-pki-common-theme = %{version}-%{release}
-Provides:         ipa-pki-ca-theme = %{version}-%{release}
-Provides:         ipa-pki-kra-theme = %{version}-%{release}
-%endif
-
 Obsoletes:        dogtag-pki-common-theme <= %{version}-%{release}
 Obsoletes:        dogtag-pki-common-ui
 Obsoletes:        dogtag-pki-ca-theme <= %{version}-%{release}
@@ -117,10 +71,6 @@ Provides:         dogtag-pki-tks-theme = %{version}-%{release}
 Provides:         pki-tks-theme = %{version}-%{release}
 Provides:         pki-tks-ui = %{version}-%{release}
 
-Provides:         dogtag-pki-ra-theme = %{version}-%{release}
-Provides:         pki-ra-theme = %{version}-%{release}
-Provides:         pki-ra-ui = %{version}-%{release}
-
 Provides:         dogtag-pki-tps-theme = %{version}-%{release}
 Provides:         pki-tps-theme = %{version}-%{release}
 Provides:         pki-tps-ui = %{version}-%{release}
@@ -213,6 +163,12 @@ cd build
 
 
 %changelog
+* Tue Sep  9 2014 Matthew Harmsen <mharmsen@redhat.com> 10.2.0-2
+- PKI TRAC Ticket #1136 - Remove ipa-pki-theme component
+- Remove 'ca-ui', 'kra-ui', 'ocsp-ui', 'ra-ui', 'tks-ui', and 'tps-ui'
+  directories
+- Consolidate 'pki-core' packages
+
 * Wed Sep  3 2014 Dogtag Team <pki-devel@redhat.com> 10.2.0-1
 - Update release number for release build
 
diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec
index 38a2a99a9..5e40c03d4 100644
--- a/specs/dogtag-pki.spec
+++ b/specs/dogtag-pki.spec
@@ -1,7 +1,7 @@
 Summary:          Dogtag Public Key Infrastructure (PKI) Suite
 Name:             dogtag-pki
 Version:          10.2.0
-Release:          2%{?dist}
+Release:          3%{?dist}
 # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
 License:          GPLv2 and LGPLv2
 URL:              http://pki.fedoraproject.org/
@@ -17,14 +17,11 @@ ExcludeArch:      ppc ppc64 ppcle ppc64le s390 s390x
 %define esc_version                1.1.0
 %define jss_version                4.2.6-31
 %define pki_core_version           10.2.0
-%define pki_kra_version            10.2.0
-%define pki_ocsp_version           10.2.0
-%define pki_tks_version            10.2.0
-%define pki_tps_version            10.2.0
 %define pki_console_version        10.2.0
 %define tomcatjss_version          7.1.0
 
 Requires:         apache-commons-codec
+Requires:         selinux-policy-base >= 3.11.1-43
 
 # Make certain that this 'meta' package requires the latest version(s)
 # of ALL top-level Dogtag PKI support packages
@@ -43,25 +40,20 @@ Requires:         dogtag-pki-console-theme >= %{dogtag_pki_theme_version}
 # Make certain that this 'meta' package requires the latest version(s)
 # of ALL Dogtag PKI core packages
 Requires:         pki-ca >= %{pki_core_version}
+Requires:         pki-kra >= %{pki_core_version}
+Requires:         pki-ocsp >= %{pki_core_version}
+Requires:         pki-tks >= %{pki_core_version}
+Requires:         pki-tps >= %{pki_core_version}
 Requires:         pki-server >= %{pki_core_version}
 Requires:         pki-tools >= %{pki_core_version}
 Requires:         pki-symkey >= %{pki_core_version}
 Requires:         pki-base >= %{pki_core_version}
 
-Requires:         selinux-policy-base >= 3.11.1-43
-
 # Make certain that this 'meta' package requires the latest version(s)
 # of ALL Dogtag PKI core javadocs
 Requires:         pki-javadoc >= %{pki_core_version}
 
 # Make certain that this 'meta' package requires the latest version(s)
-# of ALL other Dogtag PKI subsystems
-Requires:         pki-kra >= %{pki_kra_version}
-Requires:         pki-ocsp >= %{pki_ocsp_version}
-Requires:         pki-tks >= %{pki_tks_version}
-Requires:         pki-tps >= %{pki_tps_version}
-
-# Make certain that this 'meta' package requires the latest version(s)
 # of Dogtag PKI console
 Requires:         pki-console >= %{pki_console_version}
 
@@ -69,17 +61,6 @@ Requires:         pki-console >= %{pki_console_version}
 # of ALL Dogtag PKI clients
 Requires:         esc >= %{esc_version}
 
-# NOTE:  As a convenience for standalone deployments, this 'dogtag-pki'
-#        top-level meta package supplies Dogtag themes for use by the
-#        certificate server packages:
-#
-#          * dogtag-pki-theme (Dogtag Certificate System deployments)
-#            * dogtag-pki-server-theme
-#            * dogtag-pki-console-theme
-#
-Obsoletes:        ipa-pki
-Conflicts:        redhat-pki
-
 %description
 The Dogtag Public Key Infrastructure (PKI) Suite is comprised of the following
 five subsystems and a client (for use by a Token Management System):
@@ -103,6 +84,14 @@ To meet the database storage requirements of each CA, DRM, OCSP, TKS, or TPS
 instance, a 389 Directory Server must be up and running either locally on
 this machine, or remotely over the attached network connection.
 
+NOTE:  As a convenience for standalone deployments, this 'dogtag-pki'
+       top-level meta package supplies Dogtag themes for use by the
+       certificate server packages:
+
+         * dogtag-pki-theme (Dogtag Certificate System deployments)
+           * dogtag-pki-server-theme
+           * dogtag-pki-console-theme
+
 %prep
 cat > README <<EOF
 This package is just a "meta-package" whose dependencies pull in all of the
@@ -117,6 +106,12 @@ rm -rf %{buildroot}
 %doc README
 
 %changelog
+* Tue Sep  9 2014 Matthew Harmsen <mharmsen@redhat.com> 10.2.0-3
+- PKI TRAC Ticket #1136 - Remove ipa-pki-theme component
+- Remove 'ca-ui', 'kra-ui', 'ocsp-ui', 'ra-ui', 'tks-ui', and 'tps-ui'
+  directories
+- Consolidate 'pki-core' packages
+
 * Sun Sep  7 2014 Dogtag Team <pki-devel@redhat.com> 10.2.0-2
 - Updated release number for release build
 - Revised dependencies
diff --git a/specs/ipa-pki-theme.spec b/specs/ipa-pki-theme.spec
deleted file mode 100644
index 5065d2680..000000000
--- a/specs/ipa-pki-theme.spec
+++ /dev/null
@@ -1,203 +0,0 @@
-Name:             ipa-pki-theme
-Version:          10.2.0
-Release:          0.1%{?dist}
-Summary:          Certificate System - IPA PKI Theme Components
-URL:              http://pki.fedoraproject.org/
-License:          GPLv2
-Group:            System Environment/Base
-
-BuildArch:        noarch
-
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:    cmake
-
-Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz
-
-%if 0%{?rhel}
-ExcludeArch:      ppc ppc64 ppcle ppc64le s390 s390x
-%endif
-
-%global overview                                                       \
-Several PKI packages require a "virtual" theme component.  These       \
-"virtual" theme components are "Provided" by various theme "flavors"   \
-including "dogtag", "redhat", and "ipa".  Consequently,                \
-all "dogtag", "redhat", and "ipa" theme components MUST be             \
-mutually exclusive!                                                    \
-                                                                       \
-On Fedora systems, the "dogtag" theme packages are the ONLY available  \
-theme components.                                                      \
-                                                                       \
-Similarly, the "ipa" theme packages are ONLY available on RHEL         \
-systems, and represent the default theme components.                   \
-                                                                       \
-Alternatively, on RHEL systems, if the "dogtag" theme packages are     \
-available as EPEL packages, while they may be used as a transparent    \
-replacement for their corresponding "ipa" theme package, they are not  \
-intended to be used as a replacement for their corresponding "redhat"  \
-theme components.                                                      \
-                                                                       \
-Finally, if available for a RHEL system (e. g. - RHCS subscription),   \
-each "redhat" theme package MUST be used as a transparent replacement  \
-for its corresponding "ipa" theme package or "dogtag" theme package.   \
-%{nil}
-
-%description %{overview}
-
-
-%package -n       ipa-pki-server-theme
-Summary:          Certificate System - PKI Server Framework User Interface
-Group:            System Environment/Base
-
-Conflicts:        dogtag-pki-server-theme
-Conflicts:        dogtag-pki-common-theme
-Conflicts:        dogtag-pki-common-ui
-Conflicts:        dogtag-pki-ca-theme
-Conflicts:        dogtag-pki-ca-ui
-
-Conflicts:        redhat-pki-server-theme
-Conflicts:        redhat-pki-common-theme
-Conflicts:        redhat-pki-common-ui
-Conflicts:        redhat-pki-ca-theme
-Conflicts:        redhat-pki-ca-ui
-
-Obsoletes:        ipa-pki-common-theme
-Obsoletes:        ipa-pki-common-ui
-Obsoletes:        ipa-pki-ca-theme
-
-Provides:         pki-server-theme = %{version}-%{release}
-Provides:         pki-common-theme = %{version}-%{release}
-Provides:         pki-common-ui = %{version}-%{release}
-
-Provides:         ipa-pki-ca-theme = %{version}-%{release}
-Provides:         pki-ca-theme = %{version}-%{release}
-Provides:         pki-ca-ui = %{version}-%{release}
-
-%description -n   ipa-pki-server-theme
-This PKI Server Framework User Interface contains
-NO textual or graphical user interface for the PKI Server Framework.
-
-This package is used by the Certificate System utilized by IPA.
-
-%{overview}
-
-
-%prep
-
-
-%setup -q -n %{name}-%{version}%{?prerel}
-
-
-%clean
-%{__rm} -rf %{buildroot}
-
-
-%build
-%{__mkdir_p} build
-cd build
-%cmake -DVERSION=%{version}-%{release} \
-	-DBUILD_IPA_PKI_THEME:BOOL=ON \
-	..
-%{__make} VERBOSE=1 %{?_smp_mflags}
-
-
-%install
-%{__rm} -rf %{buildroot}
-cd build
-%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
-
-
-%files -n ipa-pki-server-theme
-%defattr(-,root,root,-)
-%doc dogtag/common-ui/LICENSE
-%dir %{_datadir}/pki
-%{_datadir}/pki/common-ui/
-
-
-%changelog
-* Fri Nov 22 2013 Dogtag Team <pki-devel@redhat.com> 10.2.0-0.1
-- Updated version number to 10.2.0-0.1.
-
-* Fri Nov 15 2013 Ade Lee <alee@redhat.com> 10.1.0-1
-- Trac Ticket 788 - Clean up spec files
-- Update release number for release build
-
-* Tue May 7 2013 Ade Lee <alee@redhat.com> 10.1.0-0.1
-- Change release number for 10.1 development
-
-* Fri Apr 26 2013 Ade Lee <alee@redhat.com> 10.0.2-1
-- Change release number for official release.
-
-* Wed Mar 27 2013 Endi S. Dewata <edewata@redhat.com> 10.0.2-0.1
-- Updated version number to 10.0.2-0.1.
-
-* Fri Dec 7 2012 Ade Lee <alee@redhat.com> 10.0.0-1
-- Update to official release for rc1
-
-* Mon Nov 12 2012 Ade Lee <alee@redhat.com> 10.0.0-0.6.b3
-- Update release to b3
-
-* Fri Nov 9 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.5.b2
-- Removed IPA CA theme package.
-
-* Thu Nov 8 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.4.b2
-- Renamed ipa-pki-common-theme to ipa-pki-server-theme.
-
-* Mon Oct 29 2012 Ade Lee <alee@redhat.com> 10.0.0-0.3.b2
-- Update release to b2
-
-* Mon Oct 8 2012 Ade Lee <alee@redhat.com> 10.0.0-0.2.b1
-- Update release to b1
-
-* Mon Oct 1 2012 Ade Lee <alee@redhat.com> 10.0.0-0.2.a2
-- Update release to a2
-
-* Sun Sep 30 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.2.a1
-- Modified CMake to use RPM version number
-
-* Wed Feb  1 2012 Nathan Kinder <nkinder@redhat.com> 10.0.0-0.1.a1
-- Updated package version number
-
-* Tue Aug 23 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.5-1
-- 'ipa-pki-ca-theme'
--      Bugzilla Bug #695015 - Serial No. of a revoked certificate is not
-       populated in the CA signedAudit messages (alee)
--      Bugzilla Bug #694143 - CA Agent not returning specified request (awnuk)
--      Bugzilla Bug #704351 - remove help buttons in agent and ee UI in all
-       subsystems (alee)
--      Bugzilla Bug #712931 - CS requires too many ports
-       to be open in the FW (alee)
-- 'ipa-pki-common-theme'
-
-* Thu Jul 14 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.4-1
-- 'ipa-pki-ca-theme'
--      Bugzilla Bug #669226 - Remove Legacy Build System
-- 'ipa-pki-common-theme'
--      Bugzilla Bug #669226 - Remove Legacy Build System
-
-* Thu Jan 20 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.3-1
-- Augmented overview description.
-- 'ipa-pki-ca-theme'
--     Bugzilla Bug #564207 - Searches for completed requests in the agent
-      interface returns zero entries
-
-* Thu Jan 20 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.2-1
-- 'ipa-pki-common-theme'
--     Bugzilla Bug #671058 - ipa2 - ipa-server-install fails on pkisilent -
-      xml parsing string -- ?
-
-* Tue Jan 18 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.1-1
-- Made 'ipa-pki-common-theme' a runtime dependency of 'ipa-pki-ca-theme'
-- https://pkgdb.lab.eng.bos.redhat.com/pkg/packages/srpm/5936/
--   Package Wrangler:  applied GPLv2 license header to 'xml.vm'
-
-* Thu Jan 13 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-2
-- Bugzilla Bug #668836 - Review Request: ipa-pki-theme
--   Modified overview to pertain more to these packages
--   Removed "Obsoletes:" lines (only pertinent to internal deployments)
--   Modified installation section to preserve timestamps
--   Removed sectional comments
-
-* Wed Dec 1 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
-- Initial revision. (kwright@redhat.com & mharmsen@redhat.com)
-