rpms/dogtag-pki-ca-ui/F-12 dogtag-pki-ca-ui.spec, 1.3, 1.4 import.log, 1.5, 1.6

[kwright]

Author: kwright

Update of /cvs/pkgs/rpms/dogtag-pki-ca-ui/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32031/F-12

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


Index: dogtag-pki-ca-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-ca-ui/F-12/dogtag-pki-ca-ui.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- dogtag-pki-ca-ui.spec	16 Mar 2010 20:33:40 -0000	1.3
+++ dogtag-pki-ca-ui.spec	9 Apr 2010 21:39:42 -0000	1.4
@@ -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}-%
 
 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 at 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 at 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


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-ca-ui/F-12/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	16 Mar 2010 20:33:40 -0000	1.5
+++ import.log	9 Apr 2010 21:39:42 -0000	1.6
@@ -3,3 +3,4 @@ dogtag-pki-ca-ui-1_3_0-3_el5:F-12:dogtag
 dogtag-pki-ca-ui-1_3_0-4_fc12:F-12:dogtag-pki-ca-ui-1.3.0-4.fc12.src.rpm:1263580293
 dogtag-pki-ca-ui-1_3_0-4_fc13:F-12:dogtag-pki-ca-ui-1.3.0-4.fc13.src.rpm:1263581203
 dogtag-pki-ca-ui-1_3_1-1_fc12:F-12:dogtag-pki-ca-ui-1.3.1-1.fc12.src.rpm:1268771607
+dogtag-pki-ca-ui-1_3_1-2_fc12:F-12:dogtag-pki-ca-ui-1.3.1-2.fc12.src.rpm:1270849153