A few minor adjustments need to be made to the spec files. There was no dependency on tomcat6, pki-setup added a "Requires: tomcat6" which should pull in tomcat6 for the other subsystems because they require pki-setup. A couple of the spec files were creating symbolic links in the system's tomcat 5 library directory. Not only is this absolutely WRONG (packages should never modify another package's installation because that modifies the package for all users of the package on the system, e.g. every user of tomcat5 now received a modified tomcat5 environment customized for PKI) but it is also unnecessary because the paths to the jars is now fully handled by pkicreate and kept local to pki instance.
Created attachment 463521 [details] remove obsolete references to tomcat5
Comment on attachment 463521 [details] remove obsolete references to tomcat5 Details for rejection of this patch follow in the next comment.
The following portion of this patch are APPROVED: (+)a/dogtag/common/pki-common.spec (-7 lines) (+)a/dogtag/util/pki-util.spec (-5 lines) The ONLY portion of this patch that is REJECTED is the inclusion of "tomcat6" in the 'pki-setup' package. The reason for this is because the 'pki-setup' package consists of Perl scripts utilized by ALL six PKI subsystems (CA, DRM, OCSP, TKS, RA, and TPS). ONLY the CA, DRM, OCSP, and TKS subsystems require tomcat6 (and consequently Java); the RA and TPS subsystems utilize Apache 2.2, and this would cause an incorrect dependency to both Java and Tomcat 6 on these PKI subystems. Since CA, DRM, OCSP, and TKS subsystems all require 'pki-common' as both a build-time as well as runtime component, and the 'pki-common' package SHOULD contain both a build-time and runtime requirement of 'tomcatjss >= 2.0.0' (which will contain a build-time and runtime requirement of tomcat6 -- see "Bugzilla Bug #634375 - tomcatjss rpm depends on tomcat5"), then I would suggest the following changes to these legacy spec files: * pki-common.spec ** add "BuildRequires: tomcatjss >= 2.0.0" build-time dependency ** change "Requires: tomcatjss" to "Requires: tomcatjss >= 2.0.0" * pki-ca.spec ** remove "BuildRequires: tomcatjss" build-time dependency * pki-kra.spec ** remove "BuildRequires: tomcatjss" build-time dependency * pki-ocsp.spec ** remove "BuildRequires: tomcatjss" build-time dependency * pki-tks.spec ** remove "BuildRequires: tomcatjss" build-time dependency
Created attachment 468729 [details] Changes to spec files used by cmake build system Similar to the changes proposed for spec files associated with the legacy build system per comments in https://bugzilla.redhat.com/show_bug.cgi?id=658188#c4, please apply these changes to the new spec files utilized by the cmake build system (after the appropriate changes have been made to "Bugzilla Bug #634375 - tomcatjss rpm depends on tomcat5" and it has been made available via kwright in release engineering)
I've reviewed attachment 468729 [details], I assume it's supposed to implement what is described in comment #4 (which seems fine), but if that's the case then it seems to be missing the modifications to pki-ca.spec and pki-common.spec. Am I missing something?
The attachment provides the proposed fixes to the new 'cmake' spec files which include the following: * pki/specs/pki-core.spec (creates 'pki-ca' and 'pki-common' RPMS) * pki/specs/pki-kra.spec * pki/specs/pki-ocsp.spec * pki/specs/pki-tks.spec Comment #4 above refers to the 'legacy' spec files which include the following: * pki/dogtag/pki-common.spec * pki/dogtag/pki-ca.spec * pki/dogtag/pki-kra.spec * pki/dogtag/pki-ocsp.spec * pki/dogtag/pki-tks.spec
REMINDER: These changes cannot be made until "tomcatjss 2.0.0" is rebuilt per "Bugzilla Bug #634375 - tomcatjss rpm depends on tomcat5" currently assigned to kwright which states the following: tomcatjss 2.0.0 must still be built on the following platforms: * Fedora 13 (fc13) * Fedora 14 (fc14) * Fedora 15 (fc15) * RHEL 5 EPEL (el5) * RHEL 6 (el6)
Created attachment 469840 [details] final complete patch as checked into SVN
Sending dogtag/common/pki-common.spec Sending dogtag/util/pki-util.spec Sending specs/pki-core.spec Sending specs/pki-kra.spec Sending specs/pki-ocsp.spec Sending specs/pki-tks.spec Transmitting file data ...... Committed revision 1658.
FYI. Per request from mharmsen, I have built this in fedora/koji for fc13, fc14, fc15 and el5. At this point, the only thing left is rhel6. For that I need jdennis to request the new branch be created in dist-cvs.