Skip to content

Commit

Permalink
Updated tomcatjss.spec
Browse files Browse the repository at this point in the history
  • Loading branch information
edewata committed Mar 4, 2019
1 parent df69bab commit c47536f
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions tomcatjss.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS
License: LGPLv2+
BuildArch: noarch

Version: 7.3.6
Version: 7.3.7
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1

Expand Down Expand Up @@ -57,7 +57,7 @@ BuildRequires: slf4j-jdk14
%if 0%{?rhel} && 0%{?rhel} <= 7
BuildRequires: jss >= 4.4.0-7
%else
BuildRequires: jss >= 4.5.0-1
BuildRequires: jss >= 4.5.3
%endif

# Tomcat
Expand All @@ -70,10 +70,14 @@ BuildRequires: tomcat >= 8.0.49
%if 0%{?fedora} && 0%{?fedora} <= 28
BuildRequires: tomcat >= 1:8.5.23
%else
%if 0%{?rhel}
BuildRequires: pki-servlet-container >= 1:9.0.7
%else
BuildRequires: tomcat >= 1:9.0.7
%endif
%endif
%endif
%endif

################################################################################
# Runtime Dependencies
Expand All @@ -90,7 +94,7 @@ Requires: jpackage-utils >= 0:1.7.5-15

# SLF4J
Requires: slf4j
%if 0%{?rhel} && 0%{?rhel} <= 7
%if 0%{?rhel}
# no slf4j-jdk14
%else
Requires: slf4j-jdk14
Expand All @@ -100,7 +104,7 @@ Requires: slf4j-jdk14
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: jss >= 4.4.0-7
%else
Requires: jss >= 4.5.0-1
Requires: jss >= 4.5.3
%endif

# Tomcat
Expand All @@ -113,10 +117,14 @@ Requires: tomcat >= 8.0.49
%if 0%{?fedora} && 0%{?fedora} <= 28
Requires: tomcat >= 1:8.5.23
%else
%if 0%{?rhel}
Requires: pki-servlet-container >= 1:9.0.7
%else
Requires: tomcat >= 1:9.0.7
%endif
%endif
%endif
%endif

# The 'tomcatjss' package conflicts with the 'tomcat-native' package
# because it uses an underlying NSS security model rather than the
Expand Down

0 comments on commit c47536f

Please sign in to comment.