diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2015-01-19 16:36:59 -0700 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2015-01-19 16:36:59 -0700 |
| commit | b54b03f461b6e0657270c0affa64a00cef1b3f37 (patch) | |
| tree | df13d041cf4cc46f94817faaad74f686efa04087 | |
| parent | 8edbdcb5dc369c430c5b1fdd8831152e5706d17e (diff) | |
| download | pki-b54b03f461b6e0657270c0affa64a00cef1b3f37.tar.gz pki-b54b03f461b6e0657270c0affa64a00cef1b3f37.tar.xz pki-b54b03f461b6e0657270c0affa64a00cef1b3f37.zip | |
Synced spec files with DOGTAG_10_2_RHEL_BRANCH
| -rw-r--r-- | specs/dogtag-pki.spec | 8 | ||||
| -rw-r--r-- | specs/pki-console.spec | 4 | ||||
| -rw-r--r-- | specs/pki-core.spec | 8 |
3 files changed, 16 insertions, 4 deletions
diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec index e96b7ac13..e2ec0e0a7 100644 --- a/specs/dogtag-pki.spec +++ b/specs/dogtag-pki.spec @@ -17,9 +17,13 @@ ExcludeArch: ppc ppc64 ppcle ppc64le s390 s390x %define esc_version 1.1.0 # NOTE: The following package versions are TLS compliant: %define jss_version 4.2.6-35 -%define pki_core_version %{version}-0.4 -%define pki_console_version %{version}-0.2 +%define pki_core_version %{version} +%define pki_console_version %{version} +%if 0%{?rhel} +%define tomcatjss_version 7.1.0-5 +%else %define tomcatjss_version 7.1.1 +%endif Requires: apache-commons-codec %if 0%{?fedora} >= 21 diff --git a/specs/pki-console.spec b/specs/pki-console.spec index 9eadc684f..ff6ecec50 100644 --- a/specs/pki-console.spec +++ b/specs/pki-console.spec @@ -21,12 +21,12 @@ BuildRequires: nss-devel BuildRequires: junit BuildRequires: jpackage-utils >= 1.7.5-10 BuildRequires: jss >= 4.2.6-35 -BuildRequires: pki-base >= %{version}-0.2 +BuildRequires: pki-base >= %{version} Requires: idm-console-framework Requires: java >= 1:1.7.0 Requires: ldapjdk -Requires: pki-base >= %{version}-0.2 +Requires: pki-base >= %{version} Requires: pki-console-theme >= %{version} Requires: jpackage-utils >= 1.7.5-10 Requires: jss >= 4.2.6-35 diff --git a/specs/pki-core.spec b/specs/pki-core.spec index 6959ab7fb..237f97407 100644 --- a/specs/pki-core.spec +++ b/specs/pki-core.spec @@ -65,7 +65,11 @@ BuildRequires: junit BuildRequires: jpackage-utils >= 0:1.7.5-10 BuildRequires: jss >= 4.2.6-35 BuildRequires: systemd-units +%if 0%{?rhel} +BuildRequires: tomcatjss >= 7.1.0-5 +%else BuildRequires: tomcatjss >= 7.1.1 +%endif # additional build requirements needed to build native 'tpsclient' # REMINDER: Revisit these once 'tpsclient' is rewritten as a Java app @@ -337,7 +341,11 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units +%if 0%{?rhel} +Requires: tomcatjss >= 7.1.0-5 +%else Requires: tomcatjss >= 7.1.1 +%endif %description -n pki-server The PKI Server Framework is required by the following four PKI subsystems: |