Bugzilla Bug #580282 - Dogtag PKI UI Packages should "Conflict" with associated

Red Hat PKI UI Packages . . .


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

8 files changed, 136 insertions, 8 deletions

diff --git a/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec b/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec
index 08f92b799..056dba304 100644
--- a/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec
+++ b/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-ca-ui
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dogtag Certificate System - Certificate Authority User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -18,6 +18,18 @@ 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
+
 %description
 Dogtag Certificate System is an enterprise software system designed
 to manage enterprise Public Key Infrastructure (PKI) deployments.
@@ -50,6 +62,10 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Wed Apr 7 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-2
+- Bugzilla Bug #580282 - Dogtag PKI UI Packages should "Conflict" with
+  associated Red Hat PKI UI Packages . . .
+
 * Tue Mar 9 2010 Ade Lee <alee@redhat.com> 1.3.1-1
 - Bugzilla Bug #545935 -  Add new client-auth ee port to address CVE-2009-3555
   TLS: MITM attacks via session renegotiation
diff --git a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
index ca1814734..286da4045 100644
--- a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
+++ b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-common-ui
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dogtag Certificate System - PKI Common Framework User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -18,6 +18,18 @@ 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
+
 %description
 Dogtag Certificate System is an enterprise software system designed
 to manage enterprise Public Key Infrastructure (PKI) deployments.
@@ -50,6 +62,10 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Wed Apr 7 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-2
+- Bugzilla Bug #580282 - Dogtag PKI UI Packages should "Conflict" with
+  associated Red Hat PKI UI Packages . . .
+
 * Mon Jan 18 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-1
 - Bugzilla Bug #522204 -  New Package for Dogtag PKI: dogtag-pki-common-ui
 - Fixed various licensing headers
diff --git a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec b/pki/dogtag/console-ui/dogtag-pki-console-ui.spec
index 90b0530db..073f20c1f 100644
--- a/pki/dogtag/console-ui/dogtag-pki-console-ui.spec
+++ b/pki/dogtag/console-ui/dogtag-pki-console-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-console-ui
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dogtag Certificate System - PKI Console User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -26,6 +26,18 @@ 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
+
 %description
 Dogtag Certificate System is an enterprise software system designed
 to manage enterprise Public Key Infrastructure (PKI) deployments.
@@ -65,6 +77,10 @@ rm -rf %{buildroot}
 %{_javadir}/*
 
 %changelog
+* Wed Apr 7 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-2
+- Bugzilla Bug #580282 - Dogtag PKI UI Packages should "Conflict" with
+  associated Red Hat PKI UI Packages . . .
+
 * Mon Feb 8 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-1
 - Bugzilla Bug #562986 -  Supply convenience symlink(s) for backwards
   compatibility (rename jar files as appropriate)
diff --git a/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec b/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec
index afbfc8094..1240f82b9 100644
--- a/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec
+++ b/pki/dogtag/kra-ui/dogtag-pki-kra-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-kra-ui
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dogtag Certificate System - Data Recovery Authority User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -18,6 +18,18 @@ 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
+
 %description
 Dogtag Certificate System is an enterprise software system designed
 to manage enterprise Public Key Infrastructure (PKI) deployments.
@@ -50,6 +62,10 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Wed Apr 7 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-2
+- Bugzilla Bug #580282 - Dogtag PKI UI Packages should "Conflict" with
+  associated Red Hat PKI UI Packages . . .
+
 * Mon Mar 22 2010 Christina Fu <cfu@redhat.com> 1.3.1-1
 - Bugzilla Bug #522343 Add asynchronous key recovery mode
 
diff --git a/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec b/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
index 42291d77d..713a525a6 100644
--- a/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
+++ b/pki/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-ocsp-ui
 Version:        1.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Dogtag Certificate System - Online Certificate Status Protocol User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -18,6 +18,18 @@ 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
+
 %description
 Dogtag Certificate System is an enterprise software system designed
 to manage enterprise Public Key Infrastructure (PKI) deployments.
@@ -51,6 +63,10 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Wed Apr 7 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-5
+- Bugzilla Bug #580282 - Dogtag PKI UI Packages should "Conflict" with
+  associated Red Hat PKI UI Packages . . .
+
 * Thu Jan 14 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-4
 - Bugzilla Bug #553843 - New Package for Dogtag PKI: dogtag-pki-ocsp-ui
 - Removed "Requires:  bash"
diff --git a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
index 281d80c52..26284afc7 100644
--- a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
+++ b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-ra-ui
 Version:        1.3.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Dogtag Certificate System - Registration Authority User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -18,6 +18,18 @@ 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
+
 %description
 Dogtag Certificate System is an enterprise software system designed
 to manage enterprise Public Key Infrastructure (PKI) deployments.
@@ -50,6 +62,10 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Wed Apr 7 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-6
+- Bugzilla Bug #580282 - Dogtag PKI UI Packages should "Conflict" with
+  associated Red Hat PKI UI Packages . . .
+
 * Mon Jan 18 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-5
 - Bugzilla Bug #553848 - New Package for Dogtag PKI: dogtag-pki-ra-ui
 - Fixed various licensing headers
diff --git a/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec b/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec
index 62436fd78..5041cb106 100644
--- a/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec
+++ b/pki/dogtag/tks-ui/dogtag-pki-tks-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-tks-ui
 Version:        1.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Dogtag Certificate System - Token Key Service User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -18,6 +18,18 @@ 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
+
 %description
 Dogtag Certificate System is an enterprise software system designed
 to manage enterprise Public Key Infrastructure (PKI) deployments.
@@ -50,6 +62,10 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Wed Apr 7 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-5
+- Bugzilla Bug #580282 - Dogtag PKI UI Packages should "Conflict" with
+  associated Red Hat PKI UI Packages . . .
+
 * Thu Jan 14 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-4
 - Bugzilla Bug #553845 - New Package for Dogtag PKI: dogtag-pki-tks-ui
 - Removed "Requires:  bash"
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
index f81c239e9..309a50217 100644
--- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
+++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-tps-ui
 Version:        1.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dogtag Certificate System - Token Processing System User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2 and LGPLv2
@@ -18,6 +18,18 @@ 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
+
 %description
 Dogtag Certificate System is an enterprise software system designed
 to manage enterprise Public Key Infrastructure (PKI) deployments.
@@ -50,6 +62,10 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Wed Apr 7 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-2
+- Bugzilla Bug #580282 - Dogtag PKI UI Packages should "Conflict" with
+  associated Red Hat PKI UI Packages . . .
+
 * Wed Jan 20 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-1
 - fixed "tarfileset" typo