Bugzilla Bug #638377 - Generate PKI UI components which exclude a GUI interface

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1581 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

54 files changed, 240 insertions, 266 deletions

diff --git a/pki/dogtag/ca-ui/build_dogtag b/pki/dogtag/ca-ui/build_dogtag
index 6204177df..d6b520097 100755
--- a/pki/dogtag/ca-ui/build_dogtag
+++ b/pki/dogtag/ca-ui/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="ca-ui"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec b/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec
index bc8940d16..ce105f523 100644
--- a/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec
+++ b/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec
@@ -1,5 +1,5 @@
 Name:           dogtag-pki-ca-ui
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Certificate Authority User Interface
 URL:            http://pki.fedoraproject.org/
@@ -12,23 +12,19 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant
 
+Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
+
+# NOTE:  Several PKI packages require a "virtual" UI component.  These
+#        "virtual" UI components are "Provided" by various UI "flavors"
+#        including "dogtag", "redhat", and "null".  Consequently,
+#        all "dogtag", "redhat", and "null" UI components MUST be
+#        mutually exclusive!
 Provides:       pki-ca-ui = %{version}-%{release}
 
 Obsoletes:      pki-ca-ui < %{version}-%{release}
 
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
-
-# NOTE:  The 'Dogtag Certificate System' and 'Red Hat Certificate System'
-#        may NOT co-exist on the same system!
-#
-#        For example, with the advent of EPEL packages, a user may attempt to
-#        install a Dogtag Certificate System on a system which already contains
-#        a Red Hat Certificate System.  Since the 'dogtag-pki-ca-ui' UI
-#        package conflicts with the 'redhat-pki-ca-ui' UI package,
-#        disallow this action by notifying the user that these two packages
-#        conflict.  (see Bugzilla Bug #580282 for details)
-#
-Conflicts:        redhat-pki-ca-ui
+Conflicts:      null-pki-ca-ui
+Conflicts:      redhat-pki-ca-ui
 
 %description
 Dogtag Certificate System is an enterprise software system designed
@@ -62,5 +58,5 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/ca/build_dogtag b/pki/dogtag/ca/build_dogtag
index 2fd9ced9a..de016271a 100755
--- a/pki/dogtag/ca/build_dogtag
+++ b/pki/dogtag/ca/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="ca"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/ca/pki-ca.spec b/pki/dogtag/ca/pki-ca.spec
index f9aad9708..2e537d781 100644
--- a/pki/dogtag/ca/pki-ca.spec
+++ b/pki/dogtag/ca/pki-ca.spec
@@ -1,5 +1,5 @@
 Name:           pki-ca
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Certificate Authority
 URL:            http://pki.fedoraproject.org/
@@ -21,9 +21,7 @@ BuildRequires:  tomcatjss
 Requires:       java >= 1:1.6.0
 Requires:       pki-ca-ui
 Requires:       pki-common
-Requires:       pki-console
 Requires:       pki-selinux
-Requires:       pki-silent
 Requires(post):    chkconfig
 Requires(preun):   chkconfig
 Requires(preun):   initscripts
@@ -103,5 +101,5 @@ fi
 %{_localstatedir}/run/*
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/common-ui/build_dogtag b/pki/dogtag/common-ui/build_dogtag
index 29c8cb13b..194bfbcfc 100755
--- a/pki/dogtag/common-ui/build_dogtag
+++ b/pki/dogtag/common-ui/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="common-ui"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
index bb8046a6b..c730f3444 100644
--- a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
+++ b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
@@ -1,5 +1,5 @@
 Name:           dogtag-pki-common-ui
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - PKI Common Framework User Interface
 URL:            http://pki.fedoraproject.org/
@@ -12,23 +12,19 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant
 
+Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
+
+# NOTE:  Several PKI packages require a "virtual" UI component.  These
+#        "virtual" UI components are "Provided" by various UI "flavors"
+#        including "dogtag", "redhat", and "null".  Consequently,
+#        all "dogtag", "redhat", and "null" UI components MUST be
+#        mutually exclusive!
 Provides:       pki-common-ui = %{version}.%{release}
 
 Obsoletes:      pki-common-ui < %{version}.%{release}
 
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
-
-# NOTE:  The 'Dogtag Certificate System' and 'Red Hat Certificate System'
-#        may NOT co-exist on the same system!
-#
-#        For example, with the advent of EPEL packages, a user may attempt to
-#        install a Dogtag Certificate System on a system which already contains
-#        a Red Hat Certificate System.  Since the 'dogtag-pki-common-ui' UI
-#        package conflicts with the 'redhat-pki-common-ui' UI package,
-#        disallow this action by notifying the user that these two packages
-#        conflict.  (see Bugzilla Bug #580282 for details)
-#
-Conflicts:        redhat-pki-common-ui
+Conflicts:      null-pki-common-ui
+Conflicts:      redhat-pki-common-ui
 
 %description
 Dogtag Certificate System is an enterprise software system designed
@@ -62,5 +58,5 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/common/build_dogtag b/pki/dogtag/common/build_dogtag
index 2e5c8415a..a225bc53f 100755
--- a/pki/dogtag/common/build_dogtag
+++ b/pki/dogtag/common/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="common"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec
index 0af07f8e8..290bedb8e 100644
--- a/pki/dogtag/common/pki-common.spec
+++ b/pki/dogtag/common/pki-common.spec
@@ -1,5 +1,5 @@
 Name:           pki-common
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - PKI Common Framework
 URL:            http://pki.fedoraproject.org/
@@ -113,5 +113,5 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}/
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/console-ui/build_dogtag b/pki/dogtag/console-ui/build_dogtag
index 6e50ccaaa..5cfa1424c 100755
--- a/pki/dogtag/console-ui/build_dogtag
+++ b/pki/dogtag/console-ui/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="console-ui"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec b/pki/dogtag/console-ui/dogtag-pki-console-ui.spec
index 07f0dd0c7..22c8ec6f8 100644
--- a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec
+++ b/pki/dogtag/console-ui/dogtag-pki-console-ui.spec
@@ -1,5 +1,5 @@
 Name:           dogtag-pki-console-ui
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - PKI Console User Interface
 URL:            http://pki.fedoraproject.org/
@@ -20,23 +20,18 @@ Requires:       java >= 1:1.6.0
 Requires:       jss >= 4.2.6
 Requires:       ldapjdk
 
+Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
+
+# NOTE:  Several PKI packages require a "virtual" UI component.  These
+#        "virtual" UI components are "Provided" by various UI "flavors"
+#        including "dogtag", "redhat", and "null".  Consequently,
+#        all "dogtag", "redhat", and "null" UI components MUST be
+#        mutually exclusive!
 Provides:       pki-console-ui = %{version}-%{release}
 
 Obsoletes:      pki-console-ui < %{version}-%{release}
 
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
-
-# NOTE:  The 'Dogtag Certificate System' and 'Red Hat Certificate System'
-#        may NOT co-exist on the same system!
-#
-#        For example, with the advent of EPEL packages, a user may attempt to
-#        install a Dogtag Certificate System on a system which already contains
-#        a Red Hat Certificate System.  Since the 'dogtag-pki-console-ui' UI
-#        package conflicts with the 'redhat-pki-console-ui' UI package,
-#        disallow this action by notifying the user that these two packages
-#        conflict.  (see Bugzilla Bug #580282 for details)
-#
-Conflicts:        redhat-pki-console-ui
+Conflicts:      redhat-pki-console-ui
 
 %description
 Dogtag Certificate System is an enterprise software system designed
@@ -77,5 +72,5 @@ rm -rf %{buildroot}
 %{_javadir}/*
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/console/build_dogtag b/pki/dogtag/console/build_dogtag
index 057b3af6e..3d143b9d5 100755
--- a/pki/dogtag/console/build_dogtag
+++ b/pki/dogtag/console/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="console"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/console/pki-console.spec b/pki/dogtag/console/pki-console.spec
index 9b6914b0d..3cc3241f4 100644
--- a/pki/dogtag/console/pki-console.spec
+++ b/pki/dogtag/console/pki-console.spec
@@ -1,5 +1,5 @@
 Name:           pki-console
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - PKI Console
 URL:            http://pki.fedoraproject.org/
@@ -68,5 +68,5 @@ rm -rf %{buildroot}
 %{_javadir}/*
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/java-tools/build_dogtag b/pki/dogtag/java-tools/build_dogtag
index fbcf5f718..dd833bbb8 100755
--- a/pki/dogtag/java-tools/build_dogtag
+++ b/pki/dogtag/java-tools/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="java-tools"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/java-tools/pki-java-tools.spec b/pki/dogtag/java-tools/pki-java-tools.spec
index fd516cc5d..4c952d71d 100644
--- a/pki/dogtag/java-tools/pki-java-tools.spec
+++ b/pki/dogtag/java-tools/pki-java-tools.spec
@@ -1,5 +1,5 @@
 Name:           pki-java-tools
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - PKI Java-Based Tools
 URL:            http://pki.fedoraproject.org/
@@ -83,5 +83,5 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}/
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/kra-ui/build_dogtag b/pki/dogtag/kra-ui/build_dogtag
index 6aaae6303..74e9bc860 100755
--- a/pki/dogtag/kra-ui/build_dogtag
+++ b/pki/dogtag/kra-ui/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="kra-ui"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec b/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec
index 03dd725a2..274d1ec76 100644
--- a/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec
+++ b/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec
@@ -1,5 +1,5 @@
 Name:           dogtag-pki-kra-ui
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Data Recovery Authority User Interface
 URL:            http://pki.fedoraproject.org/
@@ -12,23 +12,18 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant
 
+Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
+
+# NOTE:  Several PKI packages require a "virtual" UI component.  These
+#        "virtual" UI components are "Provided" by various UI "flavors"
+#        including "dogtag", "redhat", and "null".  Consequently,
+#        all "dogtag", "redhat", and "null" UI components MUST be
+#        mutually exclusive!
 Provides:       pki-kra-ui = %{version}-%{release}
 
 Obsoletes:      pki-kra-ui < %{version}-%{release}
 
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
-
-# NOTE:  The 'Dogtag Certificate System' and 'Red Hat Certificate System'
-#        may NOT co-exist on the same system!
-#
-#        For example, with the advent of EPEL packages, a user may attempt to
-#        install a Dogtag Certificate System on a system which already contains
-#        a Red Hat Certificate System.  Since the 'dogtag-pki-kra-ui' UI
-#        package conflicts with the 'redhat-pki-kra-ui' UI package,
-#        disallow this action by notifying the user that these two packages
-#        conflict.  (see Bugzilla Bug #580282 for details)
-#
-Conflicts:        redhat-pki-kra-ui
+Conflicts:      redhat-pki-kra-ui
 
 %description
 Dogtag Certificate System is an enterprise software system designed
@@ -62,5 +57,5 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/kra/build_dogtag b/pki/dogtag/kra/build_dogtag
index bece1b184..106a26703 100755
--- a/pki/dogtag/kra/build_dogtag
+++ b/pki/dogtag/kra/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="kra"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/kra/pki-kra.spec b/pki/dogtag/kra/pki-kra.spec
index 09eb89a62..388c0530f 100644
--- a/pki/dogtag/kra/pki-kra.spec
+++ b/pki/dogtag/kra/pki-kra.spec
@@ -1,5 +1,5 @@
 Name:           pki-kra
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Data Recovery Manager
 URL:            http://pki.fedoraproject.org/
@@ -20,10 +20,8 @@ BuildRequires:  tomcatjss
 
 Requires:       java >= 1:1.6.0
 Requires:       pki-common
-Requires:       pki-console
 Requires:       pki-kra-ui
 Requires:       pki-selinux
-Requires:       pki-silent
 Requires(post):    chkconfig
 Requires(preun):   chkconfig
 Requires(preun):   initscripts
@@ -112,5 +110,5 @@ fi
 %{_localstatedir}/run/*
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/manage/build_dogtag b/pki/dogtag/manage/build_dogtag
index 5ca0f93ff..622a76a12 100755
--- a/pki/dogtag/manage/build_dogtag
+++ b/pki/dogtag/manage/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="manage"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/manage/pki-manage.spec b/pki/dogtag/manage/pki-manage.spec
index d5a7e6d0a..78b4cde6e 100644
--- a/pki/dogtag/manage/pki-manage.spec
+++ b/pki/dogtag/manage/pki-manage.spec
@@ -1,5 +1,5 @@
 Name:           pki-manage
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - PKI Uninstall Scripts
 URL:            http://pki.fedoraproject.org/
@@ -55,5 +55,5 @@ rm -rf %{buildroot}
 %{_bindir}/*
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/meta/dogtag-pki.spec b/pki/dogtag/meta/dogtag-pki.spec
index 0d78ea1c6..9b54e50d1 100644
--- a/pki/dogtag/meta/dogtag-pki.spec
+++ b/pki/dogtag/meta/dogtag-pki.spec
@@ -1,6 +1,6 @@
 Summary:          Dogtag Public Key Infrastructure (PKI) Suite
 Name:             dogtag-pki
-Version:          2.0.0
+Version:          9.0.0
 Release:          1%{?dist}
 # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
 License:          GPLv2 and LGPLv2
@@ -9,40 +9,62 @@ Group:            System Environment/Daemons
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
 
-# Make certain that this 'meta' package requires all Dogtag PKI UI packages
-Requires:         dogtag-pki-common-ui
-Requires:         dogtag-pki-console-ui
-Requires:         dogtag-pki-ca-ui
-Requires:         dogtag-pki-kra-ui
-Requires:         dogtag-pki-ocsp-ui
-Requires:         dogtag-pki-ra-ui
-Requires:         dogtag-pki-tks-ui
-Requires:         dogtag-pki-tps-ui
-# Make certain that this 'meta' package requires all Dogtag PKI subsystems
-Requires:         pki-ca
-Requires:         pki-kra
-Requires:         pki-ocsp
-Requires:         pki-ra
-Requires:         pki-tks
-Requires:         pki-tps
-# Make certain that this 'meta' package requires all Dogtag PKI clients
-Requires:         esc
-# Make certain that this 'meta' package requires all Dogtag PKI javadocs
-Requires:         pki-common-javadoc
-Requires:         pki-java-tools-javadoc
-Requires:         pki-util-javadoc
-
-# NOTE:  The 'Dogtag Certificate System' and 'Red Hat Certificate System'
-#        may NOT co-exist on the same system!
-#
-#        For example, with the advent of EPEL packages, a user may attempt to
-#        install a Dogtag Certificate System on a system which already contains
-#        a Red Hat Certificate System.  Since the 'dogtag-pki' Meta package
-#        conflicts with the 'redhat-pki' Meta package because it uses an
-#        underlying Dogtag UI rather than an underlying Red Hat UI, disallow
-#        this action by notifying the user that these two packages conflict.
-#        (see Bugzilla Bug #580274 and Bugzilla Bug #580282 for details)
-#
+# Make certain that this 'meta' package requires the latest version(s)
+# of ALL Dogtag PKI UI packages
+Requires:         dogtag-pki-common-ui >= 9.0.0
+Requires:         dogtag-pki-console-ui >= 9.0.0
+Requires:         dogtag-pki-ca-ui >= 9.0.0
+Requires:         dogtag-pki-kra-ui >= 9.0.0
+Requires:         dogtag-pki-ocsp-ui >= 9.0.0
+Requires:         dogtag-pki-ra-ui >= 9.0.0
+Requires:         dogtag-pki-tks-ui >= 9.0.0
+Requires:         dogtag-pki-tps-ui >= 9.0.0
+
+# Make certain that this 'meta' package requires the latest version(s)
+# of ALL Dogtag PKI subsystems
+Requires:         pki-ca >= 9.0.0
+Requires:         pki-kra >= 9.0.0
+Requires:         pki-ocsp >= 9.0.0
+Requires:         pki-ra >= 9.0.0
+Requires:         pki-tks >= 9.0.0
+Requires:         pki-tps >= 9.0.0
+
+# Make certain that this 'meta' package requires the latest version(s)
+# of ALL Dogtag PKI tools
+Requires:         pki-java-tools >= 9.0.0
+Requires:         pki-native-tools >= 9.0.0
+
+# Make certain that this 'meta' package requires the latest version(s)
+# of Dogtag PKI console
+Requires:         pki-console >= 9.0.0
+
+# Make certain that this 'meta' package requires the latest version(s)
+# of ALL Dogtag PKI clients
+Requires:         esc >= 9.0.0
+
+# Make certain that this 'meta' package requires the latest version(s)
+# of ALL Dogtag PKI javadocs
+Requires:         pki-common-javadoc >= 9.0.0
+Requires:         pki-java-tools-javadoc >= 9.0.0
+Requires:         pki-util-javadoc >= 9.0.0
+
+# Make certain that this 'meta' package requires the latest version(s)
+# of ALL top-level Dogtag PKI supporting packages
+Requires:         osutil >= 9.0.0
+Requires:         pki-common >= 9.0.0
+Requires:         pki-selinux >= 9.0.0
+Requires:         pki-setup >= 9.0.0
+Requires:         pki-silent >= 9.0.0
+Requires:         pki-symkey >= 9.0.0
+Requires:         pki-util >= 9.0.0
+Requires:         tomcatjss >= 1.2.1
+
+# NOTE:  Several PKI packages require a "virtual" UI component.  These
+#        "virtual" UI components are "Provided" by various UI "flavors"
+#        including "dogtag", "redhat", and "null".  Consequently,
+#        all "dogtag", "redhat", and "null" UI components MUST be
+#        mutually exclusive!
+Conflicts:        ipa-pki
 Conflicts:        redhat-pki
 
 %description
@@ -94,5 +116,5 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/migrate/build_dogtag b/pki/dogtag/migrate/build_dogtag
index 6f6338478..2dea80510 100755
--- a/pki/dogtag/migrate/build_dogtag
+++ b/pki/dogtag/migrate/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="migrate"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/migrate/pki-migrate.spec b/pki/dogtag/migrate/pki-migrate.spec
index 16980dc45..c0d93cc5f 100644
--- a/pki/dogtag/migrate/pki-migrate.spec
+++ b/pki/dogtag/migrate/pki-migrate.spec
@@ -1,5 +1,5 @@
 Name:           pki-migrate
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - PKI Migration Scripts
 URL:            http://pki.fedoraproject.org/
@@ -68,5 +68,5 @@ rm -rf %{buildroot}
 %{_datadir}/pki/migrate/*
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/native-tools/build_dogtag b/pki/dogtag/native-tools/build_dogtag
index 54212921a..13b063d8e 100755
--- a/pki/dogtag/native-tools/build_dogtag
+++ b/pki/dogtag/native-tools/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="native-tools"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/native-tools/pki-native-tools.spec b/pki/dogtag/native-tools/pki-native-tools.spec
index 4837b2969..8b67dcc2c 100644
--- a/pki/dogtag/native-tools/pki-native-tools.spec
+++ b/pki/dogtag/native-tools/pki-native-tools.spec
@@ -1,6 +1,6 @@
 Name:           pki-native-tools
-Version:        2.0.0
-Release:        2%{?dist}
+Version:        9.0.0
+Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Native Tools
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -73,8 +73,8 @@ rm -rf %{buildroot}
 %{_libdir}/pki
 
 %changelog
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
+
 * Thu Nov 18 2010 Ade Lee <alee@redhat.com> 2.0.0-2
 - Bugzilla BZ606946 - Convert Native Tools to use ldapAPI from OpenLDAP instead of Mozldap
-
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
diff --git a/pki/dogtag/ocsp-ui/build_dogtag b/pki/dogtag/ocsp-ui/build_dogtag
index 4357e67a5..27066ed2b 100755
--- a/pki/dogtag/ocsp-ui/build_dogtag
+++ b/pki/dogtag/ocsp-ui/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="ocsp-ui"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec b/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
index 0bc648d00..5ea461007 100644
--- a/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
+++ b/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
@@ -1,5 +1,5 @@
 Name:           dogtag-pki-ocsp-ui
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Online Certificate Status Protocol User Interface
 URL:            http://pki.fedoraproject.org/
@@ -12,23 +12,18 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant
 
+Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
+
+# NOTE:  Several PKI packages require a "virtual" UI component.  These
+#        "virtual" UI components are "Provided" by various UI "flavors"
+#        including "dogtag", "redhat", and "null".  Consequently,
+#        all "dogtag", "redhat", and "null" UI components MUST be
+#        mutually exclusive!
 Provides:       pki-ocsp-ui = %{version}-%{release}
 
 Obsoletes:      pki-ocsp-ui < %{version}-%{release}
 
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
-
-# NOTE:  The 'Dogtag Certificate System' and 'Red Hat Certificate System'
-#        may NOT co-exist on the same system!
-#
-#        For example, with the advent of EPEL packages, a user may attempt to
-#        install a Dogtag Certificate System on a system which already contains
-#        a Red Hat Certificate System.  Since the 'dogtag-pki-ocsp-ui' UI
-#        package conflicts with the 'redhat-pki-ocsp-ui' UI package,
-#        disallow this action by notifying the user that these two packages
-#        conflict.  (see Bugzilla Bug #580282 for details)
-#
-Conflicts:        redhat-pki-ocsp-ui
+Conflicts:      redhat-pki-ocsp-ui
 
 %description
 Dogtag Certificate System is an enterprise software system designed
@@ -63,5 +58,5 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/ocsp/build_dogtag b/pki/dogtag/ocsp/build_dogtag
index a3be05b16..f736c15ae 100755
--- a/pki/dogtag/ocsp/build_dogtag
+++ b/pki/dogtag/ocsp/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="ocsp"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/ocsp/pki-ocsp.spec b/pki/dogtag/ocsp/pki-ocsp.spec
index 4f6a716bc..2b2def47e 100644
--- a/pki/dogtag/ocsp/pki-ocsp.spec
+++ b/pki/dogtag/ocsp/pki-ocsp.spec
@@ -1,5 +1,5 @@
 Name:           pki-ocsp
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Online Certificate Status Protocol Manager
 URL:            http://pki.fedoraproject.org/
@@ -20,10 +20,8 @@ BuildRequires:  tomcatjss
 
 Requires:       java >= 1:1.6.0
 Requires:       pki-common
-Requires:       pki-console
 Requires:       pki-ocsp-ui
 Requires:       pki-selinux
-Requires:       pki-silent
 Requires(post):    chkconfig
 Requires(preun):   chkconfig
 Requires(preun):   initscripts
@@ -121,5 +119,5 @@ fi
 %{_localstatedir}/run/*
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/osutil/build_dogtag b/pki/dogtag/osutil/build_dogtag
index 1617bafed..482d36fab 100755
--- a/pki/dogtag/osutil/build_dogtag
+++ b/pki/dogtag/osutil/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX=""
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="osutil"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/osutil/osutil.spec b/pki/dogtag/osutil/osutil.spec
index 02e1a13e0..20edbcf28 100644
--- a/pki/dogtag/osutil/osutil.spec
+++ b/pki/dogtag/osutil/osutil.spec
@@ -1,5 +1,5 @@
 Name:           osutil
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Operating System Utilities JNI Package
 URL:            http://pki.fedoraproject.org/
@@ -73,5 +73,5 @@ rm -rf %{buildroot}
 %{_libdir}/%{name}/
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/ra-ui/build_dogtag b/pki/dogtag/ra-ui/build_dogtag
index 8c7e3eb01..f88e9838c 100755
--- a/pki/dogtag/ra-ui/build_dogtag
+++ b/pki/dogtag/ra-ui/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="ra-ui"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
index 41f0219a4..32e9a72a6 100644
--- a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
+++ b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
@@ -1,5 +1,5 @@
 Name:           dogtag-pki-ra-ui
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Registration Authority User Interface
 URL:            http://pki.fedoraproject.org/
@@ -12,23 +12,18 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant
 
+Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
+
+# NOTE:  Several PKI packages require a "virtual" UI component.  These
+#        "virtual" UI components are "Provided" by various UI "flavors"
+#        including "dogtag", "redhat", and "null".  Consequently,
+#        all "dogtag", "redhat", and "null" UI components MUST be
+#        mutually exclusive!
 Provides:       pki-ra-ui = %{version}-%{release}
 
 Obsoletes:      pki-ra-ui < %{version}-%{release}
 
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
-
-# NOTE:  The 'Dogtag Certificate System' and 'Red Hat Certificate System'
-#        may NOT co-exist on the same system!
-#
-#        For example, with the advent of EPEL packages, a user may attempt to
-#        install a Dogtag Certificate System on a system which already contains
-#        a Red Hat Certificate System.  Since the 'dogtag-pki-ra-ui' UI
-#        package conflicts with the 'redhat-pki-ra-ui' UI package,
-#        disallow this action by notifying the user that these two packages
-#        conflict.  (see Bugzilla Bug #580282 for details)
-#
-Conflicts:        redhat-pki-ra-ui
+Conflicts:      redhat-pki-ra-ui
 
 %description
 Dogtag Certificate System is an enterprise software system designed
@@ -62,5 +57,5 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/ra/build_dogtag b/pki/dogtag/ra/build_dogtag
index b81f99bfd..76e17ebff 100755
--- a/pki/dogtag/ra/build_dogtag
+++ b/pki/dogtag/ra/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="ra"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/ra/pki-ra.spec b/pki/dogtag/ra/pki-ra.spec
index 027aab1c9..df5688d07 100644
--- a/pki/dogtag/ra/pki-ra.spec
+++ b/pki/dogtag/ra/pki-ra.spec
@@ -1,5 +1,5 @@
 Name:           pki-ra
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Registration Authority
 URL:            http://pki.fedoraproject.org/
@@ -19,7 +19,6 @@ Requires:       pki-native-tools
 Requires:       pki-ra-ui
 Requires:       pki-selinux
 Requires:       pki-setup
-Requires:       pki-silent
 Requires:       perl-DBD-SQLite
 Requires:       sendmail
 Requires:       sqlite
@@ -106,5 +105,5 @@ fi
 %{_localstatedir}/run/*
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/scripts/build_pki b/pki/dogtag/scripts/build_pki
index 3475c9e63..d1194a9d1 100755
--- a/pki/dogtag/scripts/build_pki
+++ b/pki/dogtag/scripts/build_pki
@@ -122,8 +122,8 @@ PKI_TPS_UI=${PKI_FLAVOR}-pki-tps-ui${RPM_EXT}
 PKI_TPS=pki-tps${RPM_EXT}
 
 # Establish optional PKI package names
-PKI_MANAGE=pki-manage${RPM_EXT}
-PKI_MIGRATE=pki-migrate${RPM_EXT}
+## PKI_MANAGE=pki-manage${RPM_EXT}
+## PKI_MIGRATE=pki-migrate${RPM_EXT}
 
 # Always start with a new release root directory
 rm -rf ${PKI_RELEASE_ROOT}
@@ -229,10 +229,10 @@ ${PKI_BUILD_SCRIPT_DIR}/tps/${PKI_BUILD_SCRIPT}
 ${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/tps/${RPM_DIR}/${PKI_TPS}
 
 # Build and install 'pki-manage' packages
-${PKI_BUILD_SCRIPT_DIR}/manage/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/manage/${RPM_DIR}/${PKI_MANAGE}
+## ${PKI_BUILD_SCRIPT_DIR}/manage/${PKI_BUILD_SCRIPT}
+## ${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/manage/${RPM_DIR}/${PKI_MANAGE}
 
 # Build and install 'pki-migrate' packages
-${PKI_BUILD_SCRIPT_DIR}/migrate/${PKI_BUILD_SCRIPT}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/migrate/${RPM_DIR}/${PKI_MIGRATE}
+## ${PKI_BUILD_SCRIPT_DIR}/migrate/${PKI_BUILD_SCRIPT}
+## ${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RELEASE_DIR}/migrate/${RPM_DIR}/${PKI_MIGRATE}
 
diff --git a/pki/dogtag/selinux/build_dogtag b/pki/dogtag/selinux/build_dogtag
index d3a63b41a..3bdc65efb 100755
--- a/pki/dogtag/selinux/build_dogtag
+++ b/pki/dogtag/selinux/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="selinux"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/selinux/pki-selinux.spec b/pki/dogtag/selinux/pki-selinux.spec
index 293b9f725..a1d50a1ba 100644
--- a/pki/dogtag/selinux/pki-selinux.spec
+++ b/pki/dogtag/selinux/pki-selinux.spec
@@ -1,5 +1,5 @@
 Name:           pki-selinux
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - PKI Selinux Policies
 URL:            https://pki.fedoraproject.org/
@@ -82,5 +82,5 @@ fi
 %{_datadir}/selinux/modules/pki.pp
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/setup/build_dogtag b/pki/dogtag/setup/build_dogtag
index 7c571a1c8..f455a7bb1 100755
--- a/pki/dogtag/setup/build_dogtag
+++ b/pki/dogtag/setup/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="setup"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/setup/pki-setup.spec b/pki/dogtag/setup/pki-setup.spec
index ae02e5aaf..4169e3841 100644
--- a/pki/dogtag/setup/pki-setup.spec
+++ b/pki/dogtag/setup/pki-setup.spec
@@ -1,6 +1,6 @@
 Name:           pki-setup
-Version:        2.0.0
-Release:        2%{?dist}
+Version:        9.0.0
+Release:        1%{?dist}
 Summary:        Dogtag Certificate system - PKI Instance Creation and Removal Scripts
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -60,8 +60,8 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
-* Fri Nov 19 2010 Ade Lee <alee@redhat.com> 2.0.0-2
-* Bugzilla BZ 606946 - Convert Native Tools to use ldapAPI from OpenLDAP instead of the Mozldap
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
 
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Ade Lee <alee@redhat.com> 2.0.0-2
+- Bugzilla BZ 606946 - Convert Native Tools to use ldapAPI from OpenLDAP instead of the Mozldap
diff --git a/pki/dogtag/silent/build_dogtag b/pki/dogtag/silent/build_dogtag
index bcb5e9346..ae60bd390 100755
--- a/pki/dogtag/silent/build_dogtag
+++ b/pki/dogtag/silent/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="silent"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/silent/pki-silent.spec b/pki/dogtag/silent/pki-silent.spec
index c55e430ed..fb80a6da8 100644
--- a/pki/dogtag/silent/pki-silent.spec
+++ b/pki/dogtag/silent/pki-silent.spec
@@ -1,5 +1,5 @@
 Name:           pki-silent
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Silent Installer
 URL:            http://pki.fedoraproject.org/
@@ -72,5 +72,5 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/symkey/build_dogtag b/pki/dogtag/symkey/build_dogtag
index d5e6e8850..865b4853d 100755
--- a/pki/dogtag/symkey/build_dogtag
+++ b/pki/dogtag/symkey/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX=""
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="pki-symkey"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/symkey/pki-symkey.spec b/pki/dogtag/symkey/pki-symkey.spec
index fb35754ba..f4ecdae76 100644
--- a/pki/dogtag/symkey/pki-symkey.spec
+++ b/pki/dogtag/symkey/pki-symkey.spec
@@ -1,5 +1,5 @@
 Name:           pki-symkey
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Symmetric Key JNI Package
 URL:            http://pki.fedoraproject.org/
@@ -78,5 +78,5 @@ rm -rf %{buildroot}
 %{_libdir}/symkey/
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/tks-ui/build_dogtag b/pki/dogtag/tks-ui/build_dogtag
index 6db36d4a6..e769ab5d8 100755
--- a/pki/dogtag/tks-ui/build_dogtag
+++ b/pki/dogtag/tks-ui/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="tks-ui"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec b/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec
index cd435e8a2..f51d903a7 100644
--- a/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec
+++ b/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec
@@ -1,5 +1,5 @@
 Name:           dogtag-pki-tks-ui
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Token Key Service User Interface
 URL:            http://pki.fedoraproject.org/
@@ -12,23 +12,18 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant
 
+Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
+
+# NOTE:  Several PKI packages require a "virtual" UI component.  These
+#        "virtual" UI components are "Provided" by various UI "flavors"
+#        including "dogtag", "redhat", and "null".  Consequently,
+#        all "dogtag", "redhat", and "null" UI components MUST be
+#        mutually exclusive!
 Provides:       pki-tks-ui = %{version}-%{release}
 
 Obsoletes:      pki-tks-ui < %{version}-%{release}
 
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
-
-# NOTE:  The 'Dogtag Certificate System' and 'Red Hat Certificate System'
-#        may NOT co-exist on the same system!
-#
-#        For example, with the advent of EPEL packages, a user may attempt to
-#        install a Dogtag Certificate System on a system which already contains
-#        a Red Hat Certificate System.  Since the 'dogtag-pki-tks-ui' UI
-#        package conflicts with the 'redhat-pki-tks-ui' UI package,
-#        disallow this action by notifying the user that these two packages
-#        conflict.  (see Bugzilla Bug #580282 for details)
-#
-Conflicts:        redhat-pki-tks-ui
+Conflicts:      redhat-pki-tks-ui
 
 %description
 Dogtag Certificate System is an enterprise software system designed
@@ -62,5 +57,5 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/tks/build_dogtag b/pki/dogtag/tks/build_dogtag
index 56b3bc9d5..3ca504ee0 100755
--- a/pki/dogtag/tks/build_dogtag
+++ b/pki/dogtag/tks/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="tks"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/tks/pki-tks.spec b/pki/dogtag/tks/pki-tks.spec
index 6d053fc23..913fccc16 100644
--- a/pki/dogtag/tks/pki-tks.spec
+++ b/pki/dogtag/tks/pki-tks.spec
@@ -1,5 +1,5 @@
 Name:           pki-tks
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Token Key Service
 URL:            http://pki.fedoraproject.org/
@@ -21,9 +21,7 @@ BuildRequires:  tomcatjss
 Requires:       java >= 1:1.6.0
 Requires:       pki-tks-ui
 Requires:       pki-common
-Requires:       pki-console
 Requires:       pki-selinux
-Requires:       pki-silent
 Requires(post):    chkconfig
 Requires(preun):   chkconfig
 Requires(preun):   initscripts
@@ -114,5 +112,5 @@ fi
 %{_localstatedir}/run/*
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/tps-ui/build_dogtag b/pki/dogtag/tps-ui/build_dogtag
index 9cb6a1d10..0e2bf56f5 100755
--- a/pki/dogtag/tps-ui/build_dogtag
+++ b/pki/dogtag/tps-ui/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="tps-ui"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
index 1c750ffa7..cbdb805bd 100644
--- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
+++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
@@ -1,5 +1,5 @@
 Name:           dogtag-pki-tps-ui
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Token Processing System User Interface
 URL:            http://pki.fedoraproject.org/
@@ -12,23 +12,18 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant
 
+Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
+
+# NOTE:  Several PKI packages require a "virtual" UI component.  These
+#        "virtual" UI components are "Provided" by various UI "flavors"
+#        including "dogtag", "redhat", and "null".  Consequently,
+#        all "dogtag", "redhat", and "null" UI components MUST be
+#        mutually exclusive!
 Provides:       pki-tps-ui =  %{version}-%{release}
 
 Obsoletes:      pki-tps-ui <  %{version}-%{release}
 
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
-
-# NOTE:  The 'Dogtag Certificate System' and 'Red Hat Certificate System'
-#        may NOT co-exist on the same system!
-#
-#        For example, with the advent of EPEL packages, a user may attempt to
-#        install a Dogtag Certificate System on a system which already contains
-#        a Red Hat Certificate System.  Since the 'dogtag-pki-tps-ui' UI
-#        package conflicts with the 'redhat-pki-tps-ui' UI package,
-#        disallow this action by notifying the user that these two packages
-#        conflict.  (see Bugzilla Bug #580282 for details)
-#
-Conflicts:        redhat-pki-tps-ui
+Conflicts:      redhat-pki-tps-ui
 
 %description
 Dogtag Certificate System is an enterprise software system designed
@@ -62,5 +57,5 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/tps/build_dogtag b/pki/dogtag/tps/build_dogtag
index e31dd4732..bddefcb15 100755
--- a/pki/dogtag/tps/build_dogtag
+++ b/pki/dogtag/tps/build_dogtag
@@ -41,7 +41,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="tps"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec
index 900e1b6c4..c129f3fe9 100644
--- a/pki/dogtag/tps/pki-tps.spec
+++ b/pki/dogtag/tps/pki-tps.spec
@@ -1,5 +1,5 @@
 Name:           pki-tps
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Token Processing System
 URL:            http://pki.fedoraproject.org/
@@ -26,7 +26,6 @@ Requires:       mozldap
 Requires:       pki-native-tools
 Requires:       pki-selinux
 Requires:       pki-setup
-Requires:       pki-silent
 Requires:       pki-tps-ui
 Requires(post):    chkconfig
 Requires(preun):   chkconfig
@@ -208,5 +207,5 @@ fi
 %{_libdir}/libtps.so
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/pki/dogtag/util/build_dogtag b/pki/dogtag/util/build_dogtag
index 6290034b6..09eac996e 100755
--- a/pki/dogtag/util/build_dogtag
+++ b/pki/dogtag/util/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="util"
 export PKI_PRODUCT
-PKI_VERSION="2.0.0"
+PKI_VERSION="9.0.0"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/util/pki-util.spec b/pki/dogtag/util/pki-util.spec
index 863af6cd0..21134316c 100644
--- a/pki/dogtag/util/pki-util.spec
+++ b/pki/dogtag/util/pki-util.spec
@@ -1,5 +1,5 @@
 Name:           pki-util
-Version:        2.0.0
+Version:        9.0.0
 Release:        1%{?dist}
 Summary:        Dogtag Certificate System - PKI Utility Framework
 URL:            http://pki.fedoraproject.org/
@@ -93,5 +93,5 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}/
 
 %changelog
-* Tue Aug 10 2010 Matthew Harmsen <mharmsen@redhat.com> 2.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0.
+* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
+- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.