rpms/tomcatjss/EL-5 import.log,1.1,1.2 tomcatjss.spec,1.1,1.2

[kwright]

Author: kwright

Update of /cvs/pkgs/rpms/tomcatjss/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5261/EL-5

Modified Files:
	import.log tomcatjss.spec 
Log Message:
respin



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tomcatjss/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	9 Jan 2010 05:06:56 -0000	1.1
+++ import.log	15 Jan 2010 00:27:59 -0000	1.2
@@ -1 +1,2 @@
 tomcatjss-1_2_0-2_el5:EL-5:tomcatjss-1.2.0-2.el5.src.rpm:1263013503
+tomcatjss-1_2_0-3_el5:EL-5:tomcatjss-1.2.0-3.el5.src.rpm:1263515145


Index: tomcatjss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcatjss/EL-5/tomcatjss.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tomcatjss.spec	9 Jan 2010 05:06:56 -0000	1.1
+++ tomcatjss.spec	15 Jan 2010 00:27:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:     tomcatjss
 Version:  1.2.0
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  JSSE implementation using JSS for Tomcat
 URL:      http://pki.fedoraproject.org/
 License:  LGPLv2+
@@ -16,15 +16,26 @@ BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
 BuildRequires:    tomcat5
 BuildRequires:    jss >= 4.2.6
+
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
 Requires:         tomcat5
 Requires:         jss >= 4.2.6
 
+# The 'tomcatjss' package conflicts with the 'tomcat-native' package
+# because it uses an underlying NSS security model rather than the
+# OpenSSL security model, so these two packages may not co-exist.
+# (see Bugzilla Bug #441974 for details)
+Conflicts:        tomcat-native
+
 %description
 A Java Secure Socket Extension (JSSE) implementation
 using Java Security Services (JSS) for Tomcat 5.5.
 
+NOTE:  The 'tomcatjss' package conflicts with the 'tomcat-native' package
+       because it uses an underlying NSS security model rather than the
+       OpenSSL security model, so these two packages may not co-exist.
+
 %prep
 
 %setup -q
@@ -61,6 +72,11 @@ rm -rf %{buildroot}
 %{_sharedstatedir}/tomcat5/server/lib/%{name}.jar
 
 %changelog
+* Thu Jan 14 2010 Matthew Harmsen <mharmsen at redhat.com> 1.2.0-3
+- Bugzilla Bug #441974 -  CA Setup Wizard cannot create new Security Domain.
+- Added 'Conflicts: tomcat-native' plus descriptive comment
+- Updated 'description' section with this information
+
 * Fri Sep 11 2009 Kevin Wright <kwright at redhat.com> 1.2.0-2
 - Bugzilla Bug #521979 - Removed references to jre, fedora 8, etc