From 8c01f861cd80cd109fe5f4fab75b3dafd19070c2 Mon Sep 17 00:00:00 2001
From: Chris Kelley <ckelley@redhat.com>
Date: Mon, 14 Feb 2022 16:59:02 +0000
Subject: [PATCH] Rebase to TomcatJSS 8.1.0

---
 .gitignore     |  1 +
 sources        |  2 +-
 tomcatjss.spec | 44 +++++++++++++++++++++++++++-----------------
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad37e07..daeba14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ tomcatjss-1.2.0.tar.gz
 /tomcatjss-8.0.0-alpha1.tar.gz
 /tomcatjss-8.0.0-alpha2.tar.gz
 /tomcatjss-8.0.0.tar.gz
+/tomcatjss-8.1.0.tar.gz
diff --git a/sources b/sources
index 9dc64de..4e58cb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tomcatjss-8.0.0.tar.gz) = 3d3c978064cf9fc44132fb694565b0bad6c3762a9eb350a753724f465303bd2354a26263b373b0989013f674c728b5eeea0fe2adc5eb6c7864a8164080301df1
+SHA512 (tomcatjss-8.1.0.tar.gz) = 9673a2167a0b3c7440cd4ee83a1ce309af28406ae589c986037b2ed44b8d3f7566420ac4f9780ae823ae9a600c8091ff627a9eb0cea3766a175208b15b6ec663
diff --git a/tomcatjss.spec b/tomcatjss.spec
index 0ae17bd..0088c58 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -9,8 +9,8 @@ BuildArch:        noarch
 
 # For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
 # For official (i.e. supported) releases, use x.y.z-r where r >=1.
-Version:          8.0.0
-Release:          3%{?_timestamp}%{?_commit_id}%{?dist}
+Version:          8.1.0
+Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
 #global           _phase -alpha1
 
 # To generate the source tarball:
@@ -34,9 +34,9 @@ Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_
 # Java
 ################################################################################
 
-%define java_devel java-11-openjdk-devel
-%define java_headless java-11-openjdk-headless
-%define java_home /usr/lib/jvm/jre-11-openjdk
+%define java_devel java-17-openjdk-devel
+%define java_headless java-17-openjdk-headless
+%define java_home %{_jvmdir}/jre-17-openjdk
 
 ################################################################################
 # Build Dependencies
@@ -57,7 +57,7 @@ BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
 
 # JSS
-BuildRequires:    jss >= 5.0.0
+BuildRequires:    jss >= 5.1.0
 
 # Tomcat
 %if 0%{?rhel} && ! 0%{?eln}
@@ -110,21 +110,28 @@ Services (NSS).
 
 %autosetup -n tomcatjss-%{version}%{?_phase} -p 1
 
+################################################################################
+%build
+################################################################################
+
+./build.sh \
+    %{?_verbose:-v} \
+    --work-dir=%{_vpath_builddir} \
+    --version=%{version} \
+    --jni-dir=%{_jnidir} \
+    dist
+
 ################################################################################
 %install
 ################################################################################
 
-# get Tomcat <major>.<minor> version number
-tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'`
-app_server=tomcat-$tomcat_version
-
-ant -f build.xml \
-    -Dversion=%{version} \
-    -Dsrc.dir=$app_server \
-    -Ddist.dir=%{_vpath_builddir} \
-    -Djnidir=%{_jnidir} \
-    -Dinstall.doc.dir=%{buildroot}%{_docdir}/%{name} \
-    -Dinstall.jar.dir=%{buildroot}%{_javadir} \
+./build.sh \
+    %{?_verbose:-v} \
+    --work-dir=%{_vpath_builddir} \
+    --version=%{version} \
+    --java-dir=%{_javadir} \
+    --doc-dir=%{_docdir} \
+    --install-dir=%{buildroot} \
     install
 
 ################################################################################
@@ -140,6 +147,9 @@ ant -f build.xml \
 
 ################################################################################
 %changelog
+* Mon Feb 14 2022 Dogtag PKI Team <devel@lists.dogtagpki.org> - 8.1.0-1
+- Rebase to TomcatJSS 8.1.0
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 8.0.0-3
 - Rebuilt for java-17-openjdk as system jdk