From 3e27211ec8ec9cdfcdc60dd3d0e73860fb443dcb Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Thu, 30 Jun 2022 13:21:29 -0500
Subject: [PATCH] Rebase to Tomcat JSS 8.2.0

---
 .gitignore     |  1 +
 sources        |  2 +-
 tomcatjss.spec | 11 ++++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 13d45d1..e3a8793 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ tomcatjss-1.2.0.tar.gz
 /tomcatjss-8.1.0.tar.gz
 /tomcatjss-8.2.0-beta1.tar.gz
 /tomcatjss-8.2.0-beta2.tar.gz
+/tomcatjss-8.2.0.tar.gz
diff --git a/sources b/sources
index e34ac22..2087d66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tomcatjss-8.2.0-beta2.tar.gz) = 15a9a74045b73275a4aa8f3abb32919e77e296bbeae4e7be88250d09f8a0eea499062997afe59945c7f2e51bf6b84d108b0b5ef26c691f03d1e2d6253381f9d2
+SHA512 (tomcatjss-8.2.0.tar.gz) = f2a1e2c3f3e2902a3aab86b5caffd9a2f13fa1931c760c8488b6733c2fe558fa4b83a416683fa5851ee93f2b7e5f71931a82d0d8aa499572d45e5e28b810fb37
diff --git a/tomcatjss.spec b/tomcatjss.spec
index bd8a48f..2b38e65 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -12,19 +12,19 @@ Name:             tomcatjss
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global           release_number 0.3
+%global           release_number 1
 
 # Development phase:
 # - development (unsupported): alpha<n> where n >= 1
 # - stabilization (unsupported): beta<n> where n >= 1
 # - GA/update (supported): <none>
-%global           phase beta2
+%undefine         phase
 
 %undefine         timestamp
 %undefine         commit_id
 
 Summary:          JSS Connector for Apache Tomcat
-URL:              https://www.dogtagpki.org/wiki/Tomcat_JSS
+URL:              https://github.com/dogtagpki/tomcatjss
 License:          LGPLv2+
 BuildArch:        noarch
 Version:          %{major_version}.%{minor_version}.%{update_version}
@@ -142,6 +142,8 @@ Services (NSS).
 %build
 ################################################################################
 
+export JAVA_HOME=%{java_home}
+
 ./build.sh \
     %{?_verbose:-v} \
     --name=%{product_id} \
@@ -177,6 +179,9 @@ Services (NSS).
 
 ################################################################################
 %changelog
+* Thu Jun 30 2022 Dogtag PKI Team <devel@lists.dogtagpki.org> - 8.2.0-1
+- Rebase to Tomcat JSS 8.2.0
+
 * Thu Apr 28 2022 Dogtag PKI Team <devel@lists.dogtagpki.org> - 8.2.0-0.3.beta2
 - Rebase to Tomcat JSS 8.2.0-beta2
 - Rename packages to dogtag-tomcatjss