diff --git a/.gitignore b/.gitignore index 98e7ecf..0b7b791 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ tomcatjss-1.2.0.tar.gz /tomcatjss-7.5.0-a1.tar.gz /tomcatjss-7.5.0-b2.tar.gz /tomcatjss-7.5.0.tar.gz +/tomcatjss-7.6.0.tar.gz diff --git a/0001-Switch-to-JDK8-source-target-compatibility.patch b/0001-Switch-to-JDK8-source-target-compatibility.patch deleted file mode 100644 index d79294f..0000000 --- a/0001-Switch-to-JDK8-source-target-compatibility.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 e58a544..b1993db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tomcatjss-7.5.0.tar.gz) = a8954bc9a820ce429a4bcbfdf756e7c202318bb454ab74e44e39a6bdcdb3dd4dd4ab6916bc1693b5eb55356db6ce4a3358dbf4dcc08bc5a8bc13c1ff95c017f0 +SHA512 (tomcatjss-7.6.0.tar.gz) = b2d28bbebac16e7d847e480db0f702d6072b5a83c057c1cd5e9bee49c9b621564641eced28cacd05742f0c9f41f99f8014f29841e131a36ce2c1e24ca006b0b1 diff --git a/tomcatjss.spec b/tomcatjss.spec index 3081829..1f24893 100644 --- a/tomcatjss.spec +++ b/tomcatjss.spec @@ -7,7 +7,7 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS License: LGPLv2+ BuildArch: noarch -Version: 7.5.0 +Version: 7.6.0 Release: 1%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -a1 @@ -27,7 +27,6 @@ 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 @@ -42,7 +41,7 @@ BuildRequires: git # Java BuildRequires: ant -BuildRequires: apache-commons-lang +BuildRequires: apache-commons-lang3 BuildRequires: java-devel BuildRequires: jpackage-utils >= 0:1.7.5-15 @@ -85,7 +84,7 @@ BuildRequires: tomcat >= 1:9.0.7 ################################################################################ # Java -Requires: apache-commons-lang +Requires: apache-commons-lang3 %if 0%{?fedora} >= 21 Requires: java-headless %else @@ -182,6 +181,9 @@ ant -f build.xml \ ################################################################################ %changelog +* Wed Oct 21 2020 Dogtag PKI Team - 7.6.0-1 +- Rebase to match latest upstream stable version v7.6.0 + * Wed Jul 29 2020 Fedora Release Engineering - 7.5.0-0.6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild