[tomcatjss/f21] Resolves: rhbz #871171,1058366

[Christina Fu]

commit b35b7757f95cc388773e890d1f329f73d9aeaa31
Author: Christina Fu <cfu at redhat.com>
Date:   Tue Sep 30 16:11:29 2014 -0700

    Resolves: rhbz #871171,1058366
    
    * Bugzilla Bug #871171 - Provide Tomcat support for TLS v1.1 and TLS v1.2 (Tomcatjss)
    * Bugzilla Bug #1058366 - NullPointerException in tomcatjss searching for attribute "clientauth"

 .gitignore     |    1 +
 sources        |    2 +-
 tomcatjss.spec |   25 ++++++++++++++++++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ddf6197..be96159 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ tomcatjss-1.2.0.tar.gz
 /tomcatjss-6.0.2.tar.gz
 /tomcatjss-7.0.0.tar.gz
 /tomcatjss-7.1.0.tar.gz
+/tomcatjss-7.1.1.tar.gz
diff --git a/sources b/sources
index ab749d6..a382a9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43566b6cd9249b4e861c5a1646de679b  tomcatjss-7.1.0.tar.gz
+54d88b865e5e13cb2a4b3f6874a33cdb  tomcatjss-7.1.1.tar.gz
diff --git a/tomcatjss.spec b/tomcatjss.spec
index 8c0c2de..48d8a28 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -1,6 +1,6 @@
 Name:     tomcatjss
-Version:  7.1.0
-Release:  6%{?dist}
+Version:  7.1.1
+Release:  1%{?dist}
 Summary:  JSSE implementation using JSS for Tomcat
 URL:      http://pki.fedoraproject.org/
 License:  LGPLv2+
@@ -17,12 +17,16 @@ Source0:  http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.ta
 BuildRequires:    ant
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils >= 0:1.7.5-15
-BuildRequires:    jss >= 4.2.6-24
+BuildRequires:    jss >= 4.2.6-35
 BuildRequires:    tomcat >= 7.0.40
 
+%if 0%{?fedora} >= 21
 Requires:         java-headless
+%else
+Requires:         java
+%endif
 Requires:         jpackage-utils >= 0:1.7.5-15
-Requires:         jss >= 4.2.6-24
+Requires:         jss >= 4.2.6-35
 Requires:         tomcat >= 7.0.40
 
 # The 'tomcatjss' package conflicts with the 'tomcat-native' package
@@ -63,6 +67,10 @@ unzip %{name}-%{version}.zip -d %{buildroot}
 
 # Install our files
 cd %{buildroot}%{_javadir}
+%if 0%{?rhel} || 0%{?fedora} < 21
+mv %{name}.jar %{name}-%{version}.jar
+ln -s %{name}-%{version}.jar %{name}.jar
+%endif
 
 %clean
 rm -rf %{buildroot}
@@ -73,6 +81,13 @@ rm -rf %{buildroot}
 %{_javadir}/*
 
 %changelog
+* Tue Sep 30 2014 Christina Fu <cfu at redhat.com> 7.1.1-1
+- Bugzilla Bug #1058366 NullPointerException in tomcatjss searching
+  for attribute "clientauth" (cfu)
+- Bugzilla Bug #871171 - Provide Tomcat support for TLS v1.1 and
+  TLS v1.2 (cfu)
+- Bumped revision to 7.1.1
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -100,7 +115,7 @@ rm -rf %{buildroot}
 - PKI TRAC Ticket #283 - Dogtag 10: Integrate Tomcat 6 'tomcatjss.jar' and
   Tomcat 7 'tomcat7jss.jar' in Fedora 18 tomcatjss package
 
-* Wed Jul 26 2012 Matthew Harmsen <mharmsen at redhat.com> 7.0.0-2
+* Thu Jul 26 2012 Matthew Harmsen <mharmsen at redhat.com> 7.0.0-2
 - Fixed runtime 'Requires' cut/paste typos
 
 * Wed Jun 06 2012 Matthew Harmsen <mharmsen at redhat.com> 7.0.0-1