summaryrefslogtreecommitdiffstats
path: root/specs
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@redhat.com>2012-07-03 17:52:33 -0700
committerMatthew Harmsen <mharmsen@redhat.com>2012-07-19 10:15:56 -0700
commit0ce6c97e4fe0e36786b78c273833b8f1dfbc12b4 (patch)
tree79c0152be9f49069e977d0156283dbed746e7cfb /specs
parent32b2670ba16084896e10ae27f7ce7b50313e375a (diff)
downloadpki-0ce6c97e4fe0e36786b78c273833b8f1dfbc12b4.tar.gz
pki-0ce6c97e4fe0e36786b78c273833b8f1dfbc12b4.tar.xz
pki-0ce6c97e4fe0e36786b78c273833b8f1dfbc12b4.zip
PKI Deployment Scriptlets
* Integration of Tomcat 7 * Introduction of dependency upon tomcatjss 7.0 * Removal of http filtering configuration mechanisms * Introduction of additional slot substitution to support revised filesystem layout * Addition of 'pkiuser' uid:gid creation methods * Inclusion of per instance '*.profile' files * Introduction of configurable 'configurationRoot' parameter * Introduction of default configuration of 'log4j' mechanism (alee) * Modify web.xml to use new Application classes to bootstrap servers (alee) * Introduction of "Wrapper" logic to support Tomcat 6 --> Tomcat 7 API change (jmagne) * Added jython helper function to allow attaching a remote java debugger (e. g. - eclipse)
Diffstat (limited to 'specs')
-rw-r--r--specs/dogtag-pki.spec19
-rw-r--r--specs/pki-core.spec32
2 files changed, 46 insertions, 5 deletions
diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec
index 20b0c7bc2..4b079751f 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}4%{?prerel}%{?dist}
+Release: %{?relprefix}5%{?prerel}%{?dist}
# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
License: GPLv2 and LGPLv2
URL: http://pki.fedoraproject.org/
@@ -17,6 +17,19 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# Establish MINIMUM package versions based upon platform
+%if 0%{?fedora} >= 18
+%define dogtag_pki_theme_version 10.0.0
+%define esc_version 1.1.0
+%define jss_version 4.2.6-24
+%define pki_core_version 10.0.0
+%define pki_kra_version 10.0.0
+%define pki_ocsp_version 10.0.0
+%define pki_ra_version 10.0.0
+%define pki_tks_version 10.0.0
+%define pki_tps_version 10.0.0
+%define pki_console_version 10.0.0
+%define tomcatjss_version 7.0.0
+%else
%if 0%{?fedora} >= 17
%define dogtag_pki_theme_version 10.0.0
%define esc_version 1.1.0
@@ -56,6 +69,7 @@ BuildArch: noarch
%define tomcatjss_version 2.0.0
%endif
%endif
+%endif
Requires: apache-commons-codec
@@ -184,6 +198,9 @@ rm -rf %{buildroot}
%doc README
%changelog
+* 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
+
* Thu Apr 5 2012 Christina Fu <cfu@redhat.com> 10.0.0-0.4.a1
- Bug 745278 - [RFE] ECC encryption keys cannot be archived
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index b742e52cf..2af431121 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}17%{?prerel}%{?dist}
+Release: %{?relprefix}19%{?prerel}%{?dist}
Summary: Certificate System - PKI Core Components
URL: http://pki.fedoraproject.org/
License: GPLv2
@@ -47,6 +47,12 @@ BuildRequires: junit
%else
BuildRequires: junit4
%endif
+%if 0%{?fedora} >= 18
+BuildRequires: jpackage-utils >= 0:1.7.5-10
+BuildRequires: jss >= 4.2.6-24
+BuildRequires: systemd-units
+BuildRequires: tomcatjss >= 7.0.0
+%else
%if 0%{?fedora} >= 16
BuildRequires: jpackage-utils >= 0:1.7.5-10
BuildRequires: jss >= 4.2.6-24
@@ -63,6 +69,7 @@ BuildRequires: jss >= 4.2.6-17
BuildRequires: tomcatjss >= 2.0.0
%endif
%endif
+%endif
# Add the following build-time requirements to support the "pki-deploy" package
BuildRequires: pki-common-theme
BuildRequires: pki-ca-theme
@@ -345,6 +352,7 @@ BuildArch: noarch
Requires: java >= 1:1.6.0
Requires: javassist
Requires: jettison
+Requires: jython >= 2.2.1
Requires: pki-common-theme >= 9.0.0
Requires: pki-java-tools = %{version}-%{release}
Requires: pki-deploy = %{version}-%{release}
@@ -360,6 +368,15 @@ Requires: velocity
%if 0%{?fedora} >= 17
Requires: resteasy >= 2.3.2-1
%endif
+%if 0%{?fedora} >= 18
+Requires: apache-commons-lang
+Requires: apache-commons-logging
+Requires: jss >= 4.2.6-24
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+Requires: tomcatjss >= 7.0.0
+%else
%if 0%{?fedora} >= 16
Requires: apache-commons-lang
Requires: apache-commons-logging
@@ -398,6 +415,7 @@ Requires: tomcatjss >= 2.0.0
%endif
%endif
%endif
+%endif
%description -n pki-common
The PKI Common Framework is required by the following four PKI subsystems:
@@ -785,8 +803,8 @@ echo "D /var/run/pki/tks 0755 root root -" >> %{buildroot}%{_sysconfdir}/tmpfil
%{__rm} %{buildroot}%{_initrddir}/pki-ocspd
%{__rm} %{buildroot}%{_initrddir}/pki-tksd
# Create symlink to the pki-jndi-realm jar
-%{__mkdir_p} %{buildroot}%{_javadir}/tomcat6
-%{__ln_s} -f %{_javadir}/pki/pki-jndi-realm.jar %{buildroot}%{_javadir}/tomcat6/pki-jndi-realm.jar
+%{__mkdir_p} %{buildroot}%{_javadir}/tomcat
+%{__ln_s} -f %{_javadir}/pki/pki-jndi-realm.jar %{buildroot}%{_javadir}/tomcat/pki-jndi-realm.jar
%else
%{__rm} %{buildroot}%{_bindir}/pkicontrol
%{__rm} %{buildroot}%{_bindir}/pkidaemon
@@ -1253,7 +1271,7 @@ fi
%if 0%{?fedora} >= 16
# Create symlink to the pki-jndi-realm jar
-%{_javadir}/tomcat6/pki-jndi-realm.jar
+%{_javadir}/tomcat/pki-jndi-realm.jar
%endif
%if 0%{?fedora} >= 15
# Details:
@@ -1413,6 +1431,12 @@ fi
%changelog
+* Wed Jul 11 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.19.a1
+- Moved 'pki-jndi-real.jar' link from 'tomcat6' to 'tomcat' (Tomcat 7)
+
+* Thu Jun 14 2012 Matthew Harmsen <mharmsen@redhat.com> 10.0.0-0.18.a1
+- Updated release of 'tomcatjss' to rely on Tomcat 7 for Fedora 18
+
* Mon May 29 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.17.a1
- Added CLI for REST services