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

Minor conditional updates to SPEC so package will build for ELN, which has

Browse Source 
tomcat rather than pki-servlet-engine

Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>
This commit is contained in:
Merlin Mathesius 2020-12-10 13:01:38 -06:00
parent fa5b6f5fde
commit 51efc6f649
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tomcatjss.spec
View File

@ -8,7 +8,7 @@ License: LGPLv2+
BuildArch: noarch
Version: 7.6.0
Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
Release: 3%{?_timestamp}%{?_commit_id}%{?dist}
#global _phase -a1
# To generate the source tarball:
@ -70,7 +70,7 @@ BuildRequires: tomcat >= 8.0.49
%if 0%{?fedora} && 0%{?fedora} <= 28
BuildRequires: tomcat >= 1:8.5.23
%else
%if 0%{?rhel}
%if 0%{?rhel} && ! 0%{?eln}
BuildRequires: pki-servlet-engine >= 1:9.0.7
%else
BuildRequires: tomcat >= 1:9.0.7
@ -117,7 +117,7 @@ Requires: tomcat >= 8.0.49
%if 0%{?fedora} && 0%{?fedora} <= 28
Requires: tomcat >= 1:8.5.23
%else
%if 0%{?rhel}
%if 0%{?rhel} && ! 0%{?eln}
Requires: pki-servlet-engine >= 1:9.0.7
%else
Requires: tomcat >= 1:9.0.7
@ -181,6 +181,9 @@ ant -f build.xml \
################################################################################
%changelog
* Thu Dec 10 2020 Merlin Mathesius <mmathesi@redhat.com> - 7.6.0-3
- Minor conditional updates to SPEC so package will build for ELN
* Thu Nov 05 2020 Dogtag PKI Team <pki-devel@redhat.com> - 7.6.0-2
- Conflict with older PKI versions due to ACL3