rpms/dogtag-pki/F-13 dogtag-pki.spec,1.1,1.2 import.log,1.1,1.2

[kwright]

Author: kwright

Update of /cvs/pkgs/rpms/dogtag-pki/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7732/F-13

Modified Files:
	dogtag-pki.spec import.log 
Log Message:
dogtag build for 580282


Index: dogtag-pki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki/F-13/dogtag-pki.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dogtag-pki.spec	23 Feb 2010 22:13:47 -0000	1.1
+++ dogtag-pki.spec	9 Apr 2010 18:52:42 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:          Dogtag Public Key Infrastructure (PKI) Suite
 Name:             dogtag-pki
 Version:          1.3.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
 License:          GPLv2 and LGPLv2
 URL:              http://pki.fedoraproject.org/
@@ -32,6 +32,19 @@ 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)
+#
+Conflicts:        redhat-pki
+
 %description
 The Dogtag Public Key Infrastructure (PKI) Suite is comprised of the following
 six subsystems and a client (for use by a Token Management System):
@@ -81,6 +94,10 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Apr 7 2010 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-2
+- Bugzilla Bug #580274 - Dogtag PKI Meta Package should "Conflict" with
+  Red Hat PKI Meta Package . . .
+
 * Thu Feb 11 2010 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-1
 - Initial build.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki/F-13/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	23 Feb 2010 22:13:47 -0000	1.1
+++ import.log	9 Apr 2010 18:52:42 -0000	1.2
@@ -1 +1,2 @@
 dogtag-pki-1_3_0-1_fc13:F-13:dogtag-pki-1.3.0-1.fc13.src.rpm:1266963093
+dogtag-pki-1_3_0-2_fc13:F-13:dogtag-pki-1.3.0-2.fc13.src.rpm:1270839139