rpms/dogtag-pki-tks-ui/devel dogtag-pki-tks-ui.spec, 1.1, 1.2 import.log, 1.1, 1.2

[kwright]

Author: kwright

Update of /cvs/pkgs/rpms/dogtag-pki-tks-ui/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22254/devel

Modified Files:
	dogtag-pki-tks-ui.spec import.log 
Log Message:
fc14 build


Index: dogtag-pki-tks-ui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-tks-ui/devel/dogtag-pki-tks-ui.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dogtag-pki-tks-ui.spec	19 Jan 2010 22:55:57 -0000	1.1
+++ dogtag-pki-tks-ui.spec	9 Jul 2010 04:42:00 -0000	1.2
@@ -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}-
 
 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 at 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 at redhat.com> 1.3.0-4
 - Bugzilla Bug #553845 - New Package for Dogtag PKI: dogtag-pki-tks-ui
 - Removed "Requires:  bash"


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dogtag-pki-tks-ui/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	19 Jan 2010 22:55:57 -0000	1.1
+++ import.log	9 Jul 2010 04:42:00 -0000	1.2
@@ -1 +1,2 @@
 dogtag-pki-tks-ui-1_3_0-4_fc13:HEAD:dogtag-pki-tks-ui-1.3.0-4.fc13.src.rpm:1263941600
+dogtag-pki-tks-ui-1_3_0-5_fc14:HEAD:dogtag-pki-tks-ui-1.3.0-5.fc14.src.rpm:1278649962