diff --git a/.gitignore b/.gitignore index 677652f..98e7ecf 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ tomcatjss-1.2.0.tar.gz /tomcatjss-7.4.1.tar.gz /tomcatjss-7.5.0-a1.tar.gz /tomcatjss-7.5.0-b2.tar.gz +/tomcatjss-7.5.0.tar.gz diff --git a/0001-Switch-to-JDK8-source-target-compatibility.patch b/0001-Switch-to-JDK8-source-target-compatibility.patch new file mode 100644 index 0000000..d79294f --- /dev/null +++ b/0001-Switch-to-JDK8-source-target-compatibility.patch @@ -0,0 +1,35 @@ +From d9e8b91443a89a4493c3c96b979079c2d65c73cd Mon Sep 17 00:00:00 2001 +From: Alexander Scheel +Date: Mon, 17 Aug 2020 19:15:39 -0400 +Subject: [PATCH] Switch to JDK8 source/target compatibility + +Signed-off-by: Alexander Scheel +--- + build.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build.xml b/build.xml +index 0610cd4..3c945a6 100644 +--- a/build.xml ++++ b/build.xml +@@ -20,7 +20,7 @@ + + + + +@@ -217,7 +217,7 @@ + description="compile the source " > + + +- ++ + + + +-- +2.26.2 + diff --git a/sources b/sources index a716e4d..e58a544 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tomcatjss-7.5.0-b2.tar.gz) = 70cbb095ac7955cb957fb1999d27e9c9a22da221ebf5c5e4e59365890938a30f1a902a6f727532eff39ac473959a3902195df53b695b5b5c28253266b3c214f4 +SHA512 (tomcatjss-7.5.0.tar.gz) = a8954bc9a820ce429a4bcbfdf756e7c202318bb454ab74e44e39a6bdcdb3dd4dd4ab6916bc1693b5eb55356db6ce4a3358dbf4dcc08bc5a8bc13c1ff95c017f0 diff --git a/tomcatjss.spec b/tomcatjss.spec index 2270555..3081829 100644 --- a/tomcatjss.spec +++ b/tomcatjss.spec @@ -8,8 +8,8 @@ License: LGPLv2+ BuildArch: noarch Version: 7.5.0 -Release: 0.6%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -b2 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +#global _phase -a1 # To generate the source tarball: # $ git clone https://github.com/dogtagpki/tomcatjss.git @@ -27,6 +27,7 @@ Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_ # \ # > tomcatjss-VERSION-RELEASE.patch # Patch: tomcatjss-VERSION-RELEASE.patch +Patch1: 0001-Switch-to-JDK8-source-target-compatibility.patch ################################################################################ # Build Dependencies @@ -141,10 +142,6 @@ is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that uses Java Security Services (JSS), a Java interface to Network Security Services (NSS). -NOTE: The 'tomcatjss' package conflicts with the 'tomcat-native' package - because it uses an underlying NSS security model rather than the - OpenSSL security model, so these two packages may not co-exist. - ################################################################################ %prep ################################################################################