Bug 668839

SPEC URL: http://people.redhat.com/kwright/pki-core/pki-core.spec
SRPM URL: http://people.redhat.com/kwright/pki-core/pki-core-9.0.0-1.fc13.src.rpm

(In reply to comment #0)
> Need to get ipa-pki-theme built in koji.
Need to get pki-core built in koji.
> 
> Summary: Certificate System - PKI Core Components
> 
> spec file and src.rpm will be posted shortly.

MODIFIED SPEC URL:  http://mharmsen.fedorapeople.org/pki-core.spec
MODIFIED SRPM URL:  http://mharmsen.fedorapeople.org/pki-core-9.0.0-2.fc12.src.rpm

TO DO:
* only have "pki-setup" own "$dir %{_datadir}/pki"
* only have "pki-setup" own "%dir %{_localstatedir}/lock/pki"
* only have "pki-setup" own "%dir %{_localstatedir}/run/pki"
* remove versions from NSS and NSPR?

I think still some issues are there
1) you are packaging file /usr/share/pki/setup/web-app_2_3.dtd which looks different license other than GPLv2
2)rpmlint reports
pki-setup.noarch: E: script-without-shebang /usr/share/pki/scripts/pkicommon.pm
pki-ca.noarch: E: subsys-not-used /etc/rc.d/init.d/pki-cad
pki-common.noarch: E: script-without-shebang /usr/share/pki/scripts/pkicommon.pm
pki-common.noarch: E: script-without-shebang /usr/share/pki/setup/CertServer.directory
pki-common.noarch: E: script-without-shebang /usr/share/pki/setup/web-app_2_3.dtd
pki-common.noarch: E: script-without-shebang /usr/share/pki/setup/menu.xml


otherwise package built fine http://koji.fedoraproject.org/koji/taskinfo?taskID=2718690

MODIFIED SPEC URL:
http://mharmsen.fedorapeople.org/pki-core.spec

MODIFIED SRPM URL:
http://mharmsen.fedorapeople.org/pki-core-9.0.0-3.fc12.src.rpm


Addressed "TO_DO" items mentioned in Comment #3.


Addressed remaining 'rpmlint' issues addressed in Comment #4 with the exception of the following:

ERROR:
pki-ca.noarch: E: subsys-not-used /etc/rc.d/init.d/pki-cad

EXPLANATION:
I do not believe that this is an error because 'pki-cad' DOES use a lock file
located under "/var/lock/subsys'.  This lockfile is contained in
'/usr/share/pki/scripts/functions' which is included in
'/etc/rc.d/init.d/pki-cad'.


ERROR:
pki-setup.noarch: E: script-without-shebang /usr/share/pki/scripts/pkicommon.pm

EXPLANATION:
I do not believe that this is an error because first line in the file
'/usr/share/pki/scripts/pkicommon.pm' is "#!/usr/bin/perl" and the permissions
on the file within the RPM and when installed are "-rwxr-xr-x".


WARNINGS TO BE ADDRESSED:
Bugzilla Bug #616096 - PKI packages do not have man pages

* koji build is successful on rawhide =>http://koji.fedoraproject.org/koji/taskinfo?taskID=2720868

* source verified as (sha1sum)
7a81d5e67d098db09ace879bb778e573db1d7635  pki-core-9.0.0.tar.gz


Remaining things to be taken care before importing this package.
1) As %dir %{_datadir}/pki is now owned by pki-setup, packages installing into %{_datadir}/pki should Requires: pki-setup

pki-native-tools is missing 
Requires: pki-setup  = %{version}-%{release}
 
otherwise package looks ok now.

APPROVED.

# cd pki/specs

# svn diff pki-core.spec
Index: pki-core.spec
===================================================================
--- pki-core.spec	(revision 1731)
+++ pki-core.spec	(working copy)
@@ -1,10 +1,6 @@
-###############################################################################
-###                       P A C K A G E   H E A D E R                       ###
-###############################################################################
-
 Name:             pki-core
 Version:          9.0.0
-Release:          1%{?dist}
+Release:          3%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -12,13 +8,17 @@
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# jss requires versioning to meet both build and runtime requirements
+# tomcatjss requires versioning since version 2.0.0 requires tomcat6
+# pki-common-theme requires versioning to meet runtime requirements
+# pki-ca-theme requires versioning to meet runtime requirements
 BuildRequires:    cmake
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
 BuildRequires:    jss >= 4.2.6-12
 BuildRequires:    ldapjdk
-BuildRequires:    nspr-devel >= 4.6.99
-BuildRequires:    nss-devel >= 3.12.3.99
+BuildRequires:    nspr-devel
+BuildRequires:    nss-devel
 BuildRequires:    openldap-devel
 BuildRequires:    osutil
 BuildRequires:    pkgconfig
@@ -84,7 +84,7 @@
 For deployment purposes, Certificate System requires ONE AND ONLY ONE  \
 of the following "Mutually-Exclusive" PKI Theme packages:              \
                                                                        \
-  * ipa-pki-theme    (IPA deployments - IPA Theme)                     \
+  * ipa-pki-theme    (IPA deployments)                                 \
   * dogtag-pki-theme (Dogtag Certificate System deployments)           \
   * redhat-pki-theme (Red Hat Certificate System deployments)          \
                                                                        \
@@ -93,14 +93,6 @@
 %description %{overview}
 
 
-###############################################################################
-###                   S U B P A C K A G E   H E A D E R S                   ###
-###############################################################################
-
-########################
-##     pki-setup      ##
-########################
-
 %package -n       pki-setup
 Summary:          Certificate System - PKI Instance Creation & Removal Scripts
 Group:            System Environment/Base
@@ -119,10 +111,6 @@
 %{overview}
 
 
-########################
-##     pki-symkey     ##
-########################
-
 %package -n       pki-symkey
 Summary:          Symmetric Key JNI Package
 Group:            System Environment/Libraries
@@ -130,7 +118,7 @@
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
 Requires:         jss >= 4.2.6-12
-Requires:         nss >= 3.12.3.99
+Requires:         nss
 
 Provides:         symkey = %{version}-%{release}
 
@@ -145,17 +133,14 @@
 %{overview}
 
 
-########################
-##  pki-native-tools  ##
-########################
-
 %package -n       pki-native-tools
 Summary:          Certificate System - Native Tools
 Group:            System Environment/Base
 
 Requires:         openldap-clients
-Requires:         nss >= 3.12.3.99
-Requires:         nss-tools >= 3.12.3.99
+Requires:         nss
+Requires:         nss-tools
+Requires:         pki-setup = %{version}-%{release}
 
 %description -n   pki-native-tools
 These platform-dependent PKI executables are used to help make
@@ -166,10 +151,6 @@
 %{overview}
 
 
-########################
-##      pki-util      ##
-########################
-
 %package -n       pki-util
 Summary:          Certificate System - PKI Utility Framework
 Group:            System Environment/Base
@@ -211,10 +192,6 @@
 %{overview}
 
 
-########################
-##   pki-java-tools   ##
-########################
-
 %package -n       pki-java-tools
 Summary:          Certificate System - PKI Java-Based Tools
 Group:            System Environment/Base
@@ -251,10 +228,6 @@
 %{overview}
 
 
-########################
-##     pki-common     ##
-########################
-
 %package -n       pki-common
 Summary:          Certificate System - PKI Common Framework
 Group:            System Environment/Base
@@ -306,10 +279,6 @@
 %{overview}
 
 
-########################
-##    pki-selinux     ##
-########################
-
 %package -n       pki-selinux
 Summary:          Certificate System - PKI Selinux Policies
 Group:            System Environment/Base
@@ -327,10 +296,6 @@
 %{overview}
 
 
-########################
-##       pki-ca       ##
-########################
-
 %package -n       pki-ca
 Summary:          Certificate System - Certificate Authority
 Group:            System Environment/Daemons
@@ -361,10 +326,6 @@
 %{overview}
 
 
-########################
-##     pki-silent     ##
-########################
-
 %package -n       pki-silent
 Summary:          Certificate System - Silent Installer
 Group:            System Environment/Base
@@ -391,10 +352,6 @@
 %{overview}
 
 
-###############################################################################
-###                   P A C K A G E   P R O C E S S I N G                   ###
-###############################################################################
-
 %prep
 
 
@@ -412,29 +369,11 @@
 %{__make} VERBOSE=1 %{?_smp_mflags}
 
 
-###############################################################################
-###                 P A C K A G E   I N S T A L L A T I O N                 ###
-###############################################################################
-
 %install
 %{__rm} -rf %{buildroot}
 cd build
-%{__make} install DESTDIR=%{buildroot}
+%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
 
-
-###############################################################################
-###              S U B P A C K A G E   I N S T A L L A T I O N              ###
-###############################################################################
-
-########################
-##     pki-setup      ##
-########################
-
-
-########################
-##     pki-symkey     ##
-########################
-
 cd %{buildroot}%{_libdir}/symkey
 %{__rm} symkey.jar
 %{__ln_s} symkey-%{version}.jar symkey.jar
@@ -444,79 +383,6 @@
 %{__ln_s} %{_libdir}/symkey/symkey.jar symkey.jar
 
 
-########################
-##  pki-native-tools  ##
-########################
-
-
-########################
-##      pki-util      ##
-########################
-
-
-########################
-##   pki-java-tools   ##
-########################
-
-
-########################
-##     pki-common     ##
-########################
-
-
-########################
-##    pki-selinux     ##
-########################
-
-
-########################
-##       pki-ca       ##
-########################
-
-
-########################
-##     pki-silent     ##
-########################
-
-
-###############################################################################
-###  P R E  &  P O S T   I N S T A L L / U N I N S T A L L   S C R I P T S  ###
-###############################################################################
-
-########################
-##     pki-setup      ##
-########################
-
-
-########################
-##     pki-symkey     ##
-########################
-
-
-########################
-##  pki-native-tools  ##
-########################
-
-
-########################
-##      pki-util      ##
-########################
-
-
-########################
-##   pki-java-tools   ##
-########################
-
-
-########################
-##     pki-common     ##
-########################
-
-
-########################
-##    pki-selinux     ##
-########################
-
 %pre -n pki-selinux
 %saveFileContext targeted
 
@@ -539,13 +405,6 @@
 fi
 
 
-########################
-##       pki-ca       ##
-########################
-
-%pre -n pki-ca
-
-
 %post -n pki-ca
 # This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add pki-cad || :
@@ -564,32 +423,18 @@
 fi
 
 
-########################
-##     pki-silent     ##
-########################
-
-
-###############################################################################
-###   I N V E N T O R Y   O F   F I L E S   A N D   D I R E C T O R I E S   ### 
-###############################################################################
-
-########################
-##     pki-setup      ##
-########################
-
 %files -n pki-setup
 %defattr(-,root,root,-)
 %doc base/setup/LICENSE
 %{_bindir}/pkicreate
 %{_bindir}/pkiremove
 %dir %{_datadir}/pki
-%{_datadir}/pki/scripts/
+%dir %{_datadir}/pki/scripts
+%{_datadir}/pki/scripts/pkicommon.pm
+%dir %{_localstatedir}/lock/pki
+%dir %{_localstatedir}/run/pki
 
 
-########################
-##     pki-symkey     ##
-########################
-
 %files -n pki-symkey
 %defattr(-,root,root,-)
 %doc base/symkey/LICENSE
@@ -597,10 +442,6 @@
 %{_libdir}/symkey/
 
 
-########################
-##  pki-native-tools  ##
-########################
-
 %files -n pki-native-tools
 %defattr(-,root,root,-)
 %doc base/native-tools/LICENSE base/native-tools/doc/README
@@ -610,28 +451,23 @@
 %{_bindir}/setpin
 %{_bindir}/sslget
 %{_bindir}/tkstool
-%dir %{_datadir}/pki
 %{_datadir}/pki/native-tools/
 
 
-########################
-##      pki-util      ##
-########################
-
 %files -n pki-util
 %defattr(-,root,root,-)
 %doc base/util/LICENSE
-%{_javadir}/pki/
+%dir %{_javadir}/pki
+%{_javadir}/pki/pki-cmsutil-%{version}.jar
+%{_javadir}/pki/pki-cmsutil.jar
+%{_javadir}/pki/pki-nsutil-%{version}.jar
+%{_javadir}/pki/pki-nsutil.jar
 
 %files -n pki-util-javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/pki-util-%{version}/
 
 
-########################
-##   pki-java-tools   ##
-########################
-
 %files -n pki-java-tools
 %defattr(-,root,root,-)
 %doc base/java-tools/LICENSE
@@ -654,23 +490,27 @@
 %{_bindir}/PrettyPrintCert
 %{_bindir}/PrettyPrintCrl
 %{_bindir}/TokenInfo
-%{_javadir}/pki/
+%{_javadir}/pki/pki-tools-%{version}.jar
+%{_javadir}/pki/pki-tools.jar
 
 %files -n pki-java-tools-javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/pki-java-tools-%{version}/
 
 
-########################
-##     pki-common     ##
-########################
-
 %files -n pki-common
 %defattr(-,root,root,-)
 %doc base/common/LICENSE
-%{_javadir}/pki/
-%dir %{_datadir}/pki
-%{_datadir}/pki/scripts/
+%{_javadir}/pki/pki-certsrv-%{version}.jar
+%{_javadir}/pki/pki-certsrv.jar
+%{_javadir}/pki/pki-cms-%{version}.jar
+%{_javadir}/pki/pki-cms.jar
+%{_javadir}/pki/pki-cmsbundle-%{version}.jar
+%{_javadir}/pki/pki-cmsbundle.jar
+%{_javadir}/pki/pki-cmscore-%{version}.jar
+%{_javadir}/pki/pki-cmscore.jar
+%{_datadir}/pki/scripts/functions
+%{_datadir}/pki/scripts/pki_apache_initscript
 %{_datadir}/pki/setup/
 
 %files -n pki-common-javadoc
@@ -678,26 +518,18 @@
 %{_javadocdir}/pki-common-%{version}/
 
 
-########################
-##    pki-selinux     ##
-########################
-
 %files -n pki-selinux
 %defattr(-,root,root,-)
 %doc base/selinux/LICENSE
 %{_datadir}/selinux/modules/pki.pp
 
 
-########################
-##       pki-ca       ##
-########################
-
 %files -n pki-ca
 %defattr(-,root,root,-)
 %doc base/ca/LICENSE
 %{_initrddir}/pki-cad
-%{_javadir}/pki/
-%dir %{_datadir}/pki
+%{_javadir}/pki/pki-ca-%{version}.jar
+%{_javadir}/pki/pki-ca.jar
 %dir %{_datadir}/pki/ca
 %{_datadir}/pki/ca/conf/
 %{_datadir}/pki/ca/emails/
@@ -705,30 +537,34 @@
 %{_datadir}/pki/ca/profiles/ca/
 %{_datadir}/pki/ca/webapps/
 %{_datadir}/pki/ca/setup/
-%dir %{_localstatedir}/lock/pki
 %dir %{_localstatedir}/lock/pki/ca
-%dir %{_localstatedir}/run/pki
 %dir %{_localstatedir}/run/pki/ca
 
 
-########################
-##     pki-silent     ##
-########################
-
 %files -n pki-silent
 %defattr(-,root,root,-)
 %doc base/silent/LICENSE
 %{_bindir}/pkisilent
-%{_javadir}/pki/
-%dir %{_datadir}/pki
+%{_javadir}/pki/pki-silent-%{version}.jar
+%{_javadir}/pki/pki-silent.jar
 %{_datadir}/pki/silent/
 
 
-###############################################################################
-###                            C H A N G E L O G                            ###
-###############################################################################
-
 %changelog
+* Thu Jan 13 2011 Matthew Harmsen <mharmsen> 9.0.0-3
+- Bugzilla Bug #668839 - Review Request: pki-core
+-   Removed empty "pre" from "pki-ca"
+-   Consolidated directory ownership
+-   Corrected file ownership within subpackages
+-   Removed all versioning from NSS and NSPR packages
+
+* Thu Jan 13 2011 Matthew Harmsen <mharmsen> 9.0.0-2
+- Bugzilla Bug #668839 - Review Request: pki-core
+-   Added component versioning comments
+-   Updated JSS from "4.2.6-10" to "4.2.6-12"
+-   Modified installation section to preserve timestamps
+-   Removed sectional comments
+
 * Wed Dec 1 2010 Matthew Harmsen <mharmsen> 9.0.0-1
 - Initial revision. (kwright & mharmsen)
 
# svn diff base/common/CMakeLists.txt
Index: base/common/CMakeLists.txt
===================================================================
--- base/common/CMakeLists.txt	(revision 1731)
+++ base/common/CMakeLists.txt	(working copy)
@@ -16,13 +16,12 @@
     FILES
         setup/CertServer.directory
         setup/menu.xml
-        setup/web-app_2_3.dtd
     DESTINATION
         ${DATA_INSTALL_DIR}/setup/
     PERMISSIONS
-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
-        GROUP_EXECUTE GROUP_READ
-        WORLD_EXECUTE WORLD_READ
+        OWNER_WRITE OWNER_READ
+        GROUP_READ
+        WORLD_READ
 )
 
 add_subdirectory(src)

# svn commit base/common/CMakeLists.txt specs/pki-core.spec
Sending        base/common/CMakeLists.txt
Sending        specs/pki-core.spec
Transmitting file data ..
Committed revision 1732.

New Package CVS Request
=======================
Package Name: pki-core
Short Description: Certificate System - PKI Core Components
Owners: kwright
Branches: F-13, F-14, EL-5
InitialCC: ausil

Git done (by process-git-requests).

Can this review be closed now?

(In reply to comment #10)
> Can this review be closed now?

Yes

closing