Resolves rhbz# 1198450, #1214858

This commit is contained in:
Ade Lee 2015-04-23 14:01:23 -04:00
parent 384013eb50
commit 7dcd85309f
3 changed files with 17 additions and 2 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ tomcatjss-1.2.0.tar.gz
/tomcatjss-7.0.0.tar.gz
/tomcatjss-7.1.0.tar.gz
/tomcatjss-7.1.1.tar.gz
/tomcatjss-7.1.2.tar.gz

View File

@ -1 +1 @@
54d88b865e5e13cb2a4b3f6874a33cdb tomcatjss-7.1.1.tar.gz
ce722f697ddd7b68d9beb4c451891018 tomcatjss-7.1.2.tar.gz

View File

@ -1,5 +1,5 @@
Name: tomcatjss
Version: 7.1.1
Version: 7.1.2
Release: 1%{?dist}
Summary: JSSE implementation using JSS for Tomcat
URL: http://pki.fedoraproject.org/
@ -15,11 +15,17 @@ Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.ta
# jss requires versioning to meet both build and runtime requirements
# tomcat requires versioning to meet both build and runtime requirements
BuildRequires: ant
BuildRequires: apache-commons-lang
BuildRequires: java-devel
BuildRequires: jpackage-utils >= 0:1.7.5-15
BuildRequires: jss >= 4.2.6-35
%if 0%{?fedora} >= 23
BuildRequires: tomcat >= 8.0.18
%else
BuildRequires: tomcat >= 7.0.40
%endif
Requires: apache-commons-lang
%if 0%{?fedora} >= 21
Requires: java-headless
%else
@ -27,7 +33,11 @@ Requires: java
%endif
Requires: jpackage-utils >= 0:1.7.5-15
Requires: jss >= 4.2.6-35
%if 0%{?fedora} >= 23
Requires: tomcat >= 8.0.18
%else
Requires: tomcat >= 7.0.40
%endif
# The 'tomcatjss' package conflicts with the 'tomcat-native' package
# because it uses an underlying NSS security model rather than the
@ -81,6 +91,10 @@ rm -rf %{buildroot}
%{_javadir}/*
%changelog
* Wed Mar 4 2015 Endi Sukma Dewata <edewata@redhat.com> 7.1.2-1
- Bugzilla Bug #1198450 - Support for Tomcat 8
- Bugzilla Bug #1214858 - Add nuxwdog support (alee)
* Tue Sep 30 2014 Christina Fu <cfu@redhat.com> 7.1.1-1
- Bugzilla Bug #1058366 NullPointerException in tomcatjss searching
for attribute "clientauth" (cfu)