rpms/pki-common/devel import.log,1.1,1.2 pki-common.spec,1.1,1.2

[kwright]

Author: kwright

Update of /cvs/pkgs/rpms/pki-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14665/devel

Modified Files:
	import.log pki-common.spec 
Log Message:
respin for 441974


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/pki-common/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	4 Jan 2010 19:39:52 -0000	1.1
+++ import.log	15 Jan 2010 23:39:07 -0000	1.2
@@ -1 +1,2 @@
 pki-common-1_3_0-6_fc13:HEAD:pki-common-1.3.0-6.fc13.src.rpm:1262633881
+pki-common-1_3_0-7_fc13:HEAD:pki-common-1.3.0-7.fc13.src.rpm:1263598604


Index: pki-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pki-common/devel/pki-common.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pki-common.spec	4 Jan 2010 19:39:52 -0000	1.1
+++ pki-common.spec	15 Jan 2010 23:39:07 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pki-common
 Version:        1.3.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Dogtag Certificate System - PKI Common Framework
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -28,7 +28,7 @@ Requires:       osutil
 Requires:       pki-common-ui
 Requires:       pki-java-tools
 Requires:       pki-setup
-Requires:       pki-util
+Requires:       rhgb
 Requires:       symkey
 Requires:       tomcatjss
 Requires:       %{_javadir}/ldapjdk.jar
@@ -37,8 +37,6 @@ Requires:       %{_javadir}/xalan-j2.jar
 Requires:       %{_javadir}/xerces-j2.jar
 Requires:       velocity
 
-Conflicts:      tomcat-native
-
 Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
 
 %description
@@ -113,6 +111,10 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}-%{version}/
 
 %changelog
+* Thu Jan 14 2010 Matthew Harmsen <mharmsen at redhat.com> 1.3.0-7
+- Bugzilla Bug #441974 -  CA Setup Wizard cannot create new Security Domain.
+- Moved 'Conflicts: tomcat-native' to lower-level 'tomcatjss' package
+
 * Thu Dec 24 2009 Kevin Wright <kwright at redhat.com> 1.3.0-6
 - Bugzilla Bug #522207 - packaging for Fedora Dogtag
 - Removed Requires:       rhgb