rpms/dogtag-pki-console-ui/F-13 dogtag-pki-console-ui.spec, 1.2, 1.3 import.log, 1.2, 1.3

[kwright]

Author: kwright

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

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


Index: dogtag-pki-console-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-console-ui/F-13/dogtag-pki-console-ui.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dogtag-pki-console-ui.spec	10 Feb 2010 01:45:25 -0000	1.2
+++ dogtag-pki-console-ui.spec	9 Apr 2010 18:53:45 -0000	1.3
@@ -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 < %{versi
 
 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 at 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 at redhat.com> 1.3.1-1
 - Bugzilla Bug #562986 -  Supply convenience symlink(s) for backwards
   compatibility (rename jar files as appropriate)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-console-ui/F-13/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	10 Feb 2010 01:45:25 -0000	1.2
+++ import.log	9 Apr 2010 18:53:45 -0000	1.3
@@ -1,2 +1,3 @@
 dogtag-pki-console-ui-1_3_0-4_fc13:HEAD:dogtag-pki-console-ui-1.3.0-4.fc13.src.rpm:1263935113
 dogtag-pki-console-ui-1_3_1-1_fc13:HEAD:dogtag-pki-console-ui-1.3.1-1.fc13.src.rpm:1265766299
+dogtag-pki-console-ui-1_3_1-2_fc13:F-13:dogtag-pki-console-ui-1.3.1-2.fc13.src.rpm:1270839212