From 88176c5c8caf146a1a408dc3a7f6b23e1a8e63b7 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Sat, 18 Aug 2012 00:40:52 -0500 Subject: Merged pki-native-tools and pki-java-tools. The pki-native-tools and pki-java-tools have been merged into pki-tools and pki-server will depend on it. Since pki-ra and pki-tps depends on pki-server they automatically depends on pki-tools as well. Ticket #295 --- specs/dogtag-pki.spec | 8 ++- specs/pki-core.spec | 156 +++++++++++++++++++++++--------------------------- specs/pki-ra.spec | 8 ++- specs/pki-tps.spec | 8 ++- 4 files changed, 86 insertions(+), 94 deletions(-) (limited to 'specs') diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec index d93904e47..3b5254dc2 100644 --- a/specs/dogtag-pki.spec +++ b/specs/dogtag-pki.spec @@ -8,7 +8,7 @@ Summary: Dogtag Public Key Infrastructure (PKI) Suite Name: dogtag-pki Version: 10.0.0 -Release: %{?relprefix}7%{?prerel}%{?dist} +Release: %{?relprefix}8%{?prerel}%{?dist} # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2 License: GPLv2 and LGPLv2 URL: http://pki.fedoraproject.org/ @@ -97,8 +97,7 @@ Requires: dogtag-pki-tps-theme >= %{dogtag_pki_theme_version} # of ALL Dogtag PKI core packages Requires: pki-ca >= %{pki_core_version} Requires: pki-server >= %{pki_core_version} -Requires: pki-java-tools >= %{pki_core_version} -Requires: pki-native-tools >= %{pki_core_version} +Requires: pki-tools >= %{pki_core_version} Requires: pki-selinux >= %{pki_core_version} Requires: pki-setup >= %{pki_core_version} Requires: pki-silent >= %{pki_core_version} @@ -198,6 +197,9 @@ rm -rf %{buildroot} %doc README %changelog +* Wed Aug 22 2012 Endi S. Dewata 10.0.0-0.8.a1 +- Replaced pki-native-tools and pki-java-tools with pki-tools + * Wed Aug 22 2012 Endi S. Dewata 10.0.0-0.7.a1 - Replaced pki-util, pki-deploy, pki-common with pki-base and pki-server diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 2ff125de4..a3edac2f8 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -14,7 +14,7 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: pki-core Version: 10.0.0 -Release: %{?relprefix}24%{?prerel}%{?dist} +Release: %{?relprefix}25%{?prerel}%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -119,12 +119,11 @@ PKI Core contains ALL top-level java-based Tomcat PKI components: \ \ * pki-setup \ * pki-symkey \ - * pki-native-tools \ * pki-util-javadoc \ - * pki-java-tools \ * pki-java-tools-javadoc \ * pki-base \ * pki-common-javadoc \ + * pki-tools \ * pki-selinux \ * pki-server \ * pki-ca \ @@ -143,7 +142,7 @@ For deployment purposes, PKI Core contains fundamental packages \ required by BOTH native-based Apache AND java-based Tomcat \ Certificate System instances consisting of the following components: \ \ - * pki-native-tools \ + * pki-tools \ * pki-selinux \ * pki-setup \ * pki-silent (required for IPA deployments; optional otherwise) \ @@ -153,8 +152,8 @@ required ONLY by ALL java-based Tomcat Certificate System instances: \ \ * pki-symkey \ * pki-base \ + * pki-tools \ * pki-server \ - * pki-java-tools \ \ PKI Core also includes the following components: \ \ @@ -221,23 +220,6 @@ This package is a part of the PKI Core used by the Certificate System. %{overview} -%package -n pki-native-tools -Summary: Certificate System - Native Tools -Group: System Environment/Base - -Requires: openldap-clients -Requires: nss -Requires: nss-tools - -%description -n pki-native-tools -These platform-dependent PKI executables are used to help make -Certificate System into a more complete and robust PKI solution. - -This package is a part of the PKI Core used by the Certificate System. - -%{overview} - - %package -n pki-util-javadoc Summary: Certificate System - PKI Utility Framework Javadocs Group: Documentation @@ -253,30 +235,6 @@ This package is a part of the PKI Core used by the Certificate System. %{overview} -%package -n pki-java-tools -Summary: Certificate System - PKI Java-Based Tools -Group: System Environment/Base - -BuildArch: noarch - -Requires: java >= 1:1.6.0 -Requires: pki-native-tools = %{version}-%{release} -Requires: pki-base = %{version}-%{release} -%if 0%{?fedora} >= 16 -Requires: jpackage-utils >= 0:1.7.5-10 -%else -Requires: jpackage-utils -%endif - -%description -n pki-java-tools -These platform-independent PKI executables are used to help make -Certificate System into a more complete and robust PKI solution. - -This package is a part of the PKI Core used by the Certificate System. - -%{overview} - - %package -n pki-java-tools-javadoc Summary: Certificate System - PKI Java-Based Tools Javadocs Group: Documentation @@ -361,6 +319,33 @@ This package is a part of the PKI Core used by the Certificate System. %{overview} +%package -n pki-tools +Summary: Certificate System - PKI Tools +Group: System Environment/Base + +Obsoletes: pki-native-tools < %{version}-%{release} +Obsoletes: pki-java-tools < %{version}-%{release} + +Requires: openldap-clients +Requires: nss +Requires: nss-tools +Requires: java >= 1:1.6.0 +Requires: pki-base = %{version}-%{release} +%if 0%{?fedora} >= 16 +Requires: jpackage-utils >= 0:1.7.5-10 +%else +Requires: jpackage-utils +%endif + +%description -n pki-tools +This package contains PKI executables that can be used to help make +Certificate System into a more complete and robust PKI solution. + +This package is a part of the PKI Core used by the Certificate System. + +%{overview} + + %package -n pki-server Summary: Certificate System - PKI Server Framework Group: System Environment/Base @@ -372,6 +357,7 @@ Obsoletes: pki-deploy < %{version}-%{release} Requires: jython >= 2.2.1 Requires: pki-common-theme >= 10.0.0 Requires: pki-base = %{version}-%{release} +Requires: pki-tools = %{version}-%{release} Requires: pki-selinux = %{version}-%{release} Requires: velocity %if 0%{?fedora} >= 17 @@ -1121,18 +1107,6 @@ fi %{_libdir}/symkey/ -%files -n pki-native-tools -%defattr(-,root,root,-) -%doc base/native-tools/LICENSE base/native-tools/doc/README -%{_bindir}/p7tool -%{_bindir}/revoker -%{_bindir}/setpin -%{_bindir}/sslget -%{_bindir}/tkstool -%dir %{_datadir}/pki -%{_datadir}/pki/native-tools/ - - %if %{?_without_javadoc:0}%{!?_without_javadoc:1} %files -n pki-util-javadoc %defattr(-,root,root,-) @@ -1140,33 +1114,6 @@ fi %endif -%files -n pki-java-tools -%defattr(-,root,root,-) -%doc base/java-tools/LICENSE -%{_bindir}/AtoB -%{_bindir}/AuditVerify -%{_bindir}/BtoA -%{_bindir}/CMCEnroll -%{_bindir}/CMCRequest -%{_bindir}/CMCResponse -%{_bindir}/CMCRevoke -%{_bindir}/CRMFPopClient -%{_bindir}/DRMTool -%{_bindir}/ExtJoiner -%{_bindir}/GenExtKeyUsage -%{_bindir}/GenIssuerAltNameExt -%{_bindir}/GenSubjectAltNameExt -%{_bindir}/HttpClient -%{_bindir}/OCSPClient -%{_bindir}/PKCS10Client -%{_bindir}/PKCS12Export -%{_bindir}/PrettyPrintCert -%{_bindir}/PrettyPrintCrl -%{_bindir}/TokenInfo -%{_javadir}/pki/pki-tools-%{version}.jar -%{_javadir}/pki/pki-tools.jar -%{_datadir}/pki/java-tools/ - %if %{?_without_javadoc:0}%{!?_without_javadoc:1} %files -n pki-java-tools-javadoc %defattr(-,root,root,-) @@ -1194,6 +1141,41 @@ fi %endif +%files -n pki-tools +%defattr(-,root,root,-) +%doc base/native-tools/LICENSE base/native-tools/doc/README +%{_bindir}/p7tool +%{_bindir}/revoker +%{_bindir}/setpin +%{_bindir}/sslget +%{_bindir}/tkstool +%dir %{_datadir}/pki +%{_datadir}/pki/native-tools/ +%{_bindir}/AtoB +%{_bindir}/AuditVerify +%{_bindir}/BtoA +%{_bindir}/CMCEnroll +%{_bindir}/CMCRequest +%{_bindir}/CMCResponse +%{_bindir}/CMCRevoke +%{_bindir}/CRMFPopClient +%{_bindir}/DRMTool +%{_bindir}/ExtJoiner +%{_bindir}/GenExtKeyUsage +%{_bindir}/GenIssuerAltNameExt +%{_bindir}/GenSubjectAltNameExt +%{_bindir}/HttpClient +%{_bindir}/OCSPClient +%{_bindir}/PKCS10Client +%{_bindir}/PKCS12Export +%{_bindir}/PrettyPrintCert +%{_bindir}/PrettyPrintCrl +%{_bindir}/TokenInfo +%{_javadir}/pki/pki-tools-%{version}.jar +%{_javadir}/pki/pki-tools.jar +%{_datadir}/pki/java-tools/ + + %files -n pki-server %defattr(-,root,root,-) %doc base/deploy/LICENSE @@ -1390,6 +1372,10 @@ fi %changelog +* Mon Aug 20 2012 Endi S. Dewata 10.0.0-0.25.a1 +- Merged pki-native-tools and pki-java-tools into pki-tools. +- Modified pki-server to depend on pki-tools. + * Mon Aug 20 2012 Endi S. Dewata 10.0.0-0.24.a1 - Split pki-common into pki-base and pki-server. - Merged pki-util into pki-base. diff --git a/specs/pki-ra.spec b/specs/pki-ra.spec index b212007cb..26483332e 100644 --- a/specs/pki-ra.spec +++ b/specs/pki-ra.spec @@ -7,7 +7,7 @@ Name: pki-ra Version: 10.0.0 -Release: %{?relprefix}4%{?prerel}%{?dist} +Release: %{?relprefix}5%{?prerel}%{?dist} Summary: Certificate System - Registration Authority URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -30,7 +30,6 @@ Requires: mod_nss >= 1.0.8 Requires: mod_perl >= 1.99_16 Requires: mod_revocator >= 1.0.3 Requires: pki-server >= 10.0.0 -Requires: pki-native-tools >= 10.0.0 Requires: pki-ra-theme >= 10.0.0 Requires: pki-setup Requires: perl-DBD-SQLite @@ -67,7 +66,7 @@ For deployment purposes, an RA requires the following components from the PKI Core package: * pki-setup - * pki-native-tools + * pki-tools * pki-selinux and can also make use of the following optional components from the PKI Core @@ -244,6 +243,9 @@ fi %changelog +* Mon Aug 20 2012 Endi S. Dewata 10.0.0-0.5.a1 +- Removed direct dependency on 'pki-native-tools'. + * Mon Aug 20 2012 Endi S. Dewata 10.0.0-0.4.a1 - Replaced 'pki-deploy' with 'pki-server'. diff --git a/specs/pki-tps.spec b/specs/pki-tps.spec index 16f88d74e..ad3d10b32 100644 --- a/specs/pki-tps.spec +++ b/specs/pki-tps.spec @@ -7,7 +7,7 @@ Name: pki-tps Version: 10.0.0 -Release: %{?relprefix}4%{?prerel}%{?dist} +Release: %{?relprefix}5%{?prerel}%{?dist} Summary: Certificate System - Token Processing System URL: http://pki.fedoraproject.org/ License: LGPLv2 @@ -39,7 +39,6 @@ Requires: mod_revocator Requires: openldap-clients Requires: perl-Mozilla-LDAP Requires: pki-server >= 10.0.0 -Requires: pki-native-tools >= 10.0.0 Requires: pki-setup Requires: pki-tps-theme >= 10.0.0 @@ -80,7 +79,7 @@ For deployment purposes, a TPS requires the following components from the \ PKI Core package: \ \ * pki-setup \ - * pki-native-tools \ + * pki-tools \ * pki-selinux \ \ and can also make use of the following optional components from the \ @@ -279,6 +278,9 @@ fi %changelog +* Mon Aug 20 2012 Endi S. Dewata 10.0.0-0.5.a1 +- Removed direct dependency on 'pki-native-tools'. + * Mon Aug 20 2012 Endi S. Dewata 10.0.0-0.4.a1 - Replaced 'pki-deploy' with 'pki-server'. -- cgit