summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@redhat.com>2016-03-29 18:32:32 -0600
committerMatthew Harmsen <mharmsen@redhat.com>2016-03-29 18:32:32 -0600
commitab75ce436b93fe9c76fb59afb0f2af41240a32dd (patch)
tree342fb92810365f42aaef62bc9abc6365cfd386cc
parenta0ee7ea934b5a6e0a7fd4998cc39db41fb00ccbb (diff)
downloadpki-ab75ce436b93fe9c76fb59afb0f2af41240a32dd.tar.gz
pki-ab75ce436b93fe9c76fb59afb0f2af41240a32dd.tar.xz
pki-ab75ce436b93fe9c76fb59afb0f2af41240a32dd.zip
Inserted Fedora 22 specific dependencies into 'pki-core.spec' (Dogtag 10.2.7)
to be in sync with Fedora 22 in Koji.
-rw-r--r--specs/pki-core.spec19
1 files changed, 18 insertions, 1 deletions
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 5e9fd938a..b4f5f2e2b 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -122,9 +122,13 @@ BuildRequires: tomcatjss >= 7.1.0-6
%if 0%{?fedora} >= 23
BuildRequires: tomcatjss >= 7.1.3
%else
+%if 0%{?fedora} == 22
+BuildRequires: tomcatjss >= 7.1.2-2
+%else
BuildRequires: tomcatjss >= 7.1.2
%endif
%endif
+%endif
# additional build requirements needed to build native 'tpsclient'
@@ -342,7 +346,9 @@ Requires: jpackage-utils >= 0:1.7.5-10
%if 0%{?fedora} >= 23
Requires: tomcat-servlet-3.1-api >= 8.0.32
%else
-%if 0%{?fedora} >= 22
+%if 0%{?fedora} == 22
+Requires: tomcat-servlet-3.0-api >= 7.0.68
+%else
Requires: tomcat-servlet-3.0-api
%endif
%endif
@@ -407,12 +413,19 @@ Requires: tomcat-el-3.0-api >= 8.0.32
Requires: tomcat-jsp-2.3-api >= 8.0.32
Requires: tomcat-servlet-3.1-api >= 8.0.32
%else
+%if 0%{?fedora} == 22
+Requires: tomcat >= 7.0.68
+Requires: tomcat-el-2.2-api >= 7.0.68
+Requires: tomcat-jsp-2.2-api >= 7.0.68
+Requires: tomcat-servlet-3.0-api >= 7.0.68
+%else
Requires: tomcat >= 7.0.47
Requires: tomcat-el-2.2-api
Requires: tomcat-jsp-2.2-api
Requires: tomcat-servlet-3.0-api
%endif
%endif
+%endif
Requires: velocity
Requires(post): systemd-units
@@ -426,9 +439,13 @@ Requires: tomcatjss >= 7.1.0-6
%if 0%{?fedora} >= 23
Requires: tomcatjss >= 7.1.3
%else
+%if 0%{?fedora} == 22
+Requires: tomcatjss >= 7.1.2-2
+%else
Requires: tomcatjss >= 7.1.2
%endif
%endif
+%endif
%description -n pki-server
The PKI Server Framework is required by the following four PKI subsystems: