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

Rebase to TomcatJSS v7.3.7

Browse Source 
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
This commit is contained in:
Alexander Scheel 2019-03-19 15:40:54 -04:00
parent a1f80d00cc
commit 6c03eb1920
No known key found for this signature in database
GPG Key ID: C0D6C737D0003143
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -22,3 +22,4 @@ tomcatjss-1.2.0.tar.gz
/tomcatjss-7.3.4.tar.gz
/tomcatjss-7.3.5.tar.gz
/tomcatjss-7.3.6.tar.gz
/tomcatjss-7.3.7.tar.gz

2
sources
View File

@ -1 +1 @@
SHA512 (tomcatjss-7.3.6.tar.gz) = 419ca4e7a850e2e8bf10a798d59f8fcf460ad89893c02743b94613f2ea73b127972eb954417e55249eba233ab655b0da5c5959c62790591fa181adaad1c58181
SHA512 (tomcatjss-7.3.7.tar.gz) = b95839fbbd1f7f3d6bcd11fbe8bbf9d177937859470130bcf1e9d30a8d79938d7a09bf18ab0e79353f653687d034fd399b7a65e0678af2cfca2e9ffa6f60dd74

21
tomcatjss.spec
View File

@ -7,8 +7,8 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS
License: LGPLv2+
BuildArch: noarch
Version: 7.3.6
Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
Version: 7.3.7
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# global _phase -a1
# To generate the source tarball:
@ -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
@ -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
@ -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
@ -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
@ -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
@ -181,6 +189,9 @@ ant -f build.xml \
################################################################################
%changelog
* Tue Mar 19 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.7-1
- Rebased to Tomcatjss 7.3.7
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild