diff options
Diffstat (limited to 'specs')
| -rw-r--r-- | specs/dogtag-pki.spec | 9 | ||||
| -rw-r--r-- | specs/pki-core.spec | 141 | ||||
| -rw-r--r-- | specs/pki-ra.spec | 12 | ||||
| -rw-r--r-- | specs/pki-tps.spec | 15 |
4 files changed, 100 insertions, 77 deletions
diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec index 4b079751f..10a2bae1a 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}5%{?prerel}%{?dist} +Release: %{?relprefix}6%{?prerel}%{?dist} # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2 License: GPLv2 and LGPLv2 URL: http://pki.fedoraproject.org/ @@ -41,7 +41,7 @@ BuildArch: noarch %define pki_tks_version 10.0.0 %define pki_tps_version 10.0.0 %define pki_console_version 10.0.0 -%define tomcatjss_version 6.0.2 +%define tomcatjss_version 7.0.0 %else %if 0%{?fedora} >= 16 %define dogtag_pki_theme_version 10.0.0 @@ -97,6 +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-common >= %{pki_core_version} +Requires: pki-deploy >= %{pki_core_version} Requires: pki-java-tools >= %{pki_core_version} Requires: pki-native-tools >= %{pki_core_version} Requires: pki-selinux >= %{pki_core_version} @@ -198,6 +199,10 @@ rm -rf %{buildroot} %doc README %changelog +* Tue Aug 14 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.6.a1 +- Updated release of 'tomcatjss' to rely on Tomcat 7 for Fedora 17 +- Added 'pki-deploy' runtime dependency + * Thu Jun 14 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.5.a1 - Updated release of 'tomcatjss' to rely on Tomcat 7 for Fedora 18 diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 5d682be87..20dfdf34c 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}22%{?prerel}%{?dist} +Release: %{?relprefix}23%{?prerel}%{?dist} Summary: Certificate System - PKI Core Components URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -74,11 +74,11 @@ BuildRequires: tomcatjss >= 2.0.0 %endif %endif # Add the following build-time requirements to support the "pki-deploy" package -BuildRequires: pki-common-theme -BuildRequires: pki-ca-theme -BuildRequires: pki-kra-theme -BuildRequires: pki-ocsp-theme -BuildRequires: pki-tks-theme +BuildRequires: pki-common-theme >= 10.0.0 +BuildRequires: pki-ca-theme >= 10.0.0 +BuildRequires: pki-kra-theme >= 10.0.0 +BuildRequires: pki-ocsp-theme >= 10.0.0 +BuildRequires: pki-tks-theme >= 10.0.0 Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz @@ -117,7 +117,6 @@ to manage enterprise Public Key Infrastructure (PKI) deployments. \ \ PKI Core contains ALL top-level java-based Tomcat PKI components: \ \ - * pki-deploy \ * pki-setup \ * pki-symkey \ * pki-native-tools \ @@ -128,6 +127,7 @@ PKI Core contains ALL top-level java-based Tomcat PKI components: \ * pki-common \ * pki-common-javadoc \ * pki-selinux \ + * pki-deploy \ * pki-ca \ * pki-kra \ * pki-ocsp \ @@ -175,20 +175,6 @@ ONLY ONE of the following "Mutually-Exclusive" PKI Theme packages: \ %description %{overview} -%package -n pki-deploy -Summary: Certificate System - PKI Instance Deployment Scripts -Group: System Environment/Base - -BuildArch: noarch - -%description -n pki-deploy -PKI deployment scripts are used to create and remove instances from PKI deployments. - -This package is a part of the PKI Core used by the Certificate System. - -%{overview} - - %package -n pki-setup Summary: Certificate System - PKI Instance Creation & Removal Scripts Group: System Environment/Base @@ -356,9 +342,8 @@ Requires: java >= 1:1.6.0 Requires: javassist Requires: jettison Requires: jython >= 2.2.1 -Requires: pki-common-theme >= 9.0.0 +Requires: pki-common-theme >= 10.0.0 Requires: pki-java-tools = %{version}-%{release} -Requires: pki-deploy = %{version}-%{release} Requires: pki-setup = %{version}-%{release} Requires: %{_javadir}/ldapjdk.jar Requires: %{_javadir}/velocity.jar @@ -370,6 +355,7 @@ Requires: %{_javadir}/xml-commons-resolver.jar Requires: velocity %if 0%{?fedora} >= 17 Requires: resteasy >= 2.3.2-1 +Requires: tomcatjss >= 7.0.0 %endif %if 0%{?fedora} >= 18 Requires: apache-commons-lang @@ -467,6 +453,23 @@ This package is a part of the PKI Core used by the Certificate System. %{overview} +%package -n pki-deploy +Summary: Certificate System - PKI Instance Deployment Scripts +Group: System Environment/Base + +BuildArch: noarch + +Requires: pki-common = %{version}-%{release} + +%description -n pki-deploy +PKI deployment scripts are used to create and remove instances from +PKI deployments. + +This package is a part of the PKI Core used by the Certificate System. + +%{overview} + + %package -n pki-ca Summary: Certificate System - Certificate Authority Group: System Environment/Daemons @@ -474,8 +477,8 @@ Group: System Environment/Daemons BuildArch: noarch Requires: java >= 1:1.6.0 -Requires: pki-ca-theme >= 9.0.0 -Requires: pki-common = %{version}-%{release} +Requires: pki-ca-theme >= 10.0.0 +Requires: pki-deploy = %{version}-%{release} Requires: pki-selinux = %{version}-%{release} %if 0%{?fedora} >= 16 Requires(post): systemd-units @@ -523,8 +526,8 @@ Group: System Environment/Daemons BuildArch: noarch Requires: java >= 1:1.6.0 -Requires: pki-kra-theme >= 9.0.0 -Requires: pki-common = %{version}-%{release} +Requires: pki-kra-theme >= 10.0.0 +Requires: pki-deploy = %{version}-%{release} Requires: pki-selinux = %{version}-%{release} %if 0%{?fedora} >= 16 Requires(post): systemd-units @@ -578,8 +581,8 @@ Group: System Environment/Daemons BuildArch: noarch Requires: java >= 1:1.6.0 -Requires: pki-ocsp-theme >= 9.0.0 -Requires: pki-common = %{version}-%{release} +Requires: pki-ocsp-theme >= 10.0.0 +Requires: pki-deploy = %{version}-%{release} Requires: pki-selinux = %{version}-%{release} %if 0%{?fedora} >= 16 Requires(post): systemd-units @@ -640,8 +643,8 @@ Group: System Environment/Daemons BuildArch: noarch Requires: java >= 1:1.6.0 -Requires: pki-tks-theme >= 9.0.0 -Requires: pki-common = %{version}-%{release} +Requires: pki-tks-theme >= 10.0.0 +Requires: pki-deploy = %{version}-%{release} Requires: pki-selinux = %{version}-%{release} Requires: pki-symkey = %{version}-%{release} %if 0%{?fedora} >= 16 @@ -1127,41 +1130,6 @@ fi ## PKI deployment process %endif -%files -n pki-deploy -%defattr(-,root,root,-) -%doc base/deploy/LICENSE -%{_bindir}/pkispawn -%{_bindir}/pkidestroy -#%{_bindir}/pki-setup-proxy -%dir %{python_sitelib}/pki -%{python_sitelib}/pki/_* -%{python_sitelib}/pki/deployment/ -%dir %{_datadir}/pki -%dir %{_datadir}/pki/deployment -%{_datadir}/pki/deployment/config/ -%dir %{_datadir}/pki/deployment/spawn -%{_datadir}/pki/deployment/spawn/ca/ -%{_datadir}/pki/deployment/spawn/kra/ -%{_datadir}/pki/deployment/spawn/ocsp/ -%{_datadir}/pki/deployment/spawn/ra/ -%{_datadir}/pki/deployment/spawn/tks/ -%{_datadir}/pki/deployment/spawn/tps/ -%dir %{_datadir}/pki/deployment/destroy -%{_datadir}/pki/deployment/destroy/ca/ -%{_datadir}/pki/deployment/destroy/kra/ -%{_datadir}/pki/deployment/destroy/ocsp/ -%{_datadir}/pki/deployment/destroy/ra/ -%{_datadir}/pki/deployment/destroy/tks/ -%{_datadir}/pki/deployment/destroy/tps/ -%dir %{_datadir}/pki/scripts -%{_datadir}/pki/scripts/operations -%dir %{_localstatedir}/lock/pki -%dir %{_localstatedir}/run/pki -%if 0%{?fedora} >= 16 -%{_bindir}/pkidaemon -%endif - - %files -n pki-setup %defattr(-,root,root,-) %doc base/setup/LICENSE @@ -1297,6 +1265,41 @@ fi %{_datadir}/selinux/modules/pki.pp +%files -n pki-deploy +%defattr(-,root,root,-) +%doc base/deploy/LICENSE +%{_bindir}/pkispawn +%{_bindir}/pkidestroy +#%{_bindir}/pki-setup-proxy +%dir %{python_sitelib}/pki +%{python_sitelib}/pki/_* +%{python_sitelib}/pki/deployment/ +%dir %{_datadir}/pki +%dir %{_datadir}/pki/deployment +%{_datadir}/pki/deployment/config/ +%dir %{_datadir}/pki/deployment/spawn +%{_datadir}/pki/deployment/spawn/ca/ +%{_datadir}/pki/deployment/spawn/kra/ +%{_datadir}/pki/deployment/spawn/ocsp/ +%{_datadir}/pki/deployment/spawn/ra/ +%{_datadir}/pki/deployment/spawn/tks/ +%{_datadir}/pki/deployment/spawn/tps/ +%dir %{_datadir}/pki/deployment/destroy +%{_datadir}/pki/deployment/destroy/ca/ +%{_datadir}/pki/deployment/destroy/kra/ +%{_datadir}/pki/deployment/destroy/ocsp/ +%{_datadir}/pki/deployment/destroy/ra/ +%{_datadir}/pki/deployment/destroy/tks/ +%{_datadir}/pki/deployment/destroy/tps/ +%dir %{_datadir}/pki/scripts +%{_datadir}/pki/scripts/operations +%dir %{_localstatedir}/lock/pki +%dir %{_localstatedir}/run/pki +%if 0%{?fedora} >= 16 +%{_bindir}/pkidaemon +%endif + + %files -n pki-ca %defattr(-,root,root,-) %doc base/ca/LICENSE @@ -1426,6 +1429,12 @@ fi %changelog +* Thu Aug 16 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.23.a1 +- Updated release of 'tomcatjss' to rely on Tomcat 7 for Fedora 17 +- Changed Dogtag 10 build-time and runtime requirements for 'pki-deploy' +- Altered PKI Package Dependency Chain (top-to-bottom): + pki-ca, pki-kra, pki-ocsp, pki-tks --> pki-deploy --> pki-common + * Mon Aug 13 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.22.a1 - Added pki-client.jar. diff --git a/specs/pki-ra.spec b/specs/pki-ra.spec index b52a4f4e4..e500826e2 100644 --- a/specs/pki-ra.spec +++ b/specs/pki-ra.spec @@ -7,7 +7,7 @@ Name: pki-ra Version: 10.0.0 -Release: %{?relprefix}2%{?prerel}%{?dist} +Release: %{?relprefix}3%{?prerel}%{?dist} Summary: Certificate System - Registration Authority URL: http://pki.fedoraproject.org/ License: GPLv2 @@ -29,9 +29,10 @@ BuildRequires: nss-devel Requires: mod_nss >= 1.0.8 Requires: mod_perl >= 1.99_16 Requires: mod_revocator >= 1.0.3 -Requires: pki-native-tools -Requires: pki-ra-theme >= 9.0.0 -Requires: pki-selinux +Requires: pki-deploy >= 10.0.0 +Requires: pki-native-tools >= 10.0.0 +Requires: pki-ra-theme >= 10.0.0 +Requires: pki-selinux >= 10.0.0 Requires: pki-setup Requires: perl-DBD-SQLite Requires: sqlite @@ -244,6 +245,9 @@ fi %changelog +* Thu Aug 16 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.3.a1 +- Added 'pki-deploy' runtime dependency + * Mon Aug 13 2012 Ade Lee <alee@redhat.com> 10.0.0-0.2.a1 - Added systemd scripts - Ported config files and init scripts to apache 2.4 diff --git a/specs/pki-tps.spec b/specs/pki-tps.spec index c75711d38..6845dd485 100644 --- a/specs/pki-tps.spec +++ b/specs/pki-tps.spec @@ -7,7 +7,7 @@ Name: pki-tps Version: 10.0.0 -Release: %{?relprefix}2%{?prerel}%{?dist} +Release: %{?relprefix}3%{?prerel}%{?dist} Summary: Certificate System - Token Processing System URL: http://pki.fedoraproject.org/ License: LGPLv2 @@ -24,7 +24,7 @@ BuildRequires: cmake BuildRequires: apr-devel BuildRequires: apr-util-devel BuildRequires: cyrus-sasl-devel -BuildRequires: httpd-devel +BuildRequires: httpd-devel >= 2.4.2 BuildRequires: openldap-devel BuildRequires: nspr-devel BuildRequires: nss-devel @@ -38,10 +38,11 @@ Requires: mod_perl Requires: mod_revocator Requires: openldap-clients Requires: perl-Mozilla-LDAP -Requires: pki-native-tools -Requires: pki-selinux +Requires: pki-deploy >= 10.0.0 +Requires: pki-native-tools >= 10.0.0 +Requires: pki-selinux >= 10.0.0 Requires: pki-setup -Requires: pki-tps-theme >= 9.0.0 +Requires: pki-tps-theme >= 10.0.0 %if 0%{?fedora} >= 16 Requires(post): systemd-units @@ -279,6 +280,10 @@ fi %changelog +* Thu Aug 16 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.3.a1 +- Changed 'httpd-devel' build-time dependency to require '2.4.2' +- Added 'pki-deploy' runtime dependency + * Mon Aug 13 2012 Ade Lee <alee@redhat.com> 10.0.0-0.2.a1 - Added systemd scripts - Ported config files and init scripts to apache 2.4 |