rpms/tomcatjss
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Tomcat dependencies.

Browse Source
This commit is contained in:
Endi S. Dewata 2018-05-12 03:32:51 +02:00
parent 1fec1b1ff1
commit db731a435a
1 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tomcatjss.spec
View File

@ -8,7 +8,7 @@ License: LGPLv2+
BuildArch: noarch
Version: 7.3.0
Release: 1%{?dist}
Release: 2%{?dist}
Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}/tomcatjss-%{version}.tar.gz
@ -16,7 +16,7 @@ Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}/tom
# Tomcat
################################################################################
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
%global app_server tomcat-8.5
%else
%if 0%{?fedora}
@ -33,23 +33,32 @@ Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}/tom
# jpackage-utils requires versioning to meet both build and runtime requirements
# jss requires versioning to meet both build and runtime requirements
# tomcat requires versioning to meet both build and runtime requirements
Conflicts: pki-base < 10.6.0
# Java
BuildRequires: ant
BuildRequires: apache-commons-lang
BuildRequires: java-devel
BuildRequires: jpackage-utils >= 0:1.7.5-15
# JSS
%if 0%{?fedora}
BuildRequires: jss >= 4.4.2-2
%else
BuildRequires: jss >= 4.4.0-7
%endif
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
BuildRequires: tomcat >= 8.5.23
# Tomcat
%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
BuildRequires: tomcat >= 1:9.0.7
%else
%if 0%{?fedora} >= 28
BuildRequires: tomcat >= 1:8.5.23
%else
%if 0%{?fedora}
BuildRequires: tomcat >= 8.0.49
%else
BuildRequires: tomcat >= 7.0.68
BuildRequires: tomcat >= 7.0.69
%endif
%endif
%endif
@ -57,6 +66,7 @@ BuildRequires: tomcat >= 7.0.68
# Runtime Dependencies
################################################################################
# Java
Requires: apache-commons-lang
%if 0%{?fedora} >= 21
Requires: java-headless
@ -64,19 +74,27 @@ Requires: java-headless
Requires: java
%endif
Requires: jpackage-utils >= 0:1.7.5-15
# JSS
%if 0%{?fedora}
Requires: jss >= 4.4.2-2
%else
Requires: jss >= 4.4.0-7
%endif
%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
Requires: tomcat >= 8.5.23
#Tomcat
%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
Requires: tomcat >= 1:9.0.7
%else
%if 0%{?fedora} >= 28
Requires: tomcat >= 1:8.5.23
%else
%if 0%{?fedora}
Requires: tomcat >= 8.0.49
Conflicts: tomcat >= 1:8.5
%else
Requires: tomcat >= 7.0.68
Requires: tomcat >= 7.0.69
%endif
%endif
%endif
@ -85,6 +103,8 @@ Requires: tomcat >= 7.0.68
# OpenSSL security model, so these two packages may not co-exist.
# (see Bugzilla Bug #441974 for details)
Conflicts: tomcat-native
Conflicts: pki-base < 10.6.0
%if 0%{?rhel}
# For EPEL, override the '_sharedstatedir' macro on RHEL
@ -130,7 +150,10 @@ ant -f build.xml \
################################################################################
%changelog
################################################################################
* Sat May 12 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.0-2
- Fixed Tomcat dependencies
* Thu Apr 12 2018 Dogtag PKI Team <pki-devel@redhat.com> 7.3.0-1
- Cleaned up spec file
- Rebased to TomcatJSS 7.3.0 final