From 802edee6b939255b26ed1561055c585fdbd077d9 Mon Sep 17 00:00:00 2001
From: Chris Kelley <ckelley@redhat.com>
Date: Fri, 10 Feb 2023 11:04:42 +0000
Subject: [PATCH] Rebase to version 8.3.0

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

diff --git a/.gitignore b/.gitignore
index 86bea8e..90e24d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ tomcatjss-1.2.0.tar.gz
 /tomcatjss-8.2.0-beta2.tar.gz
 /tomcatjss-8.2.0.tar.gz
 /tomcatjss-8.3.0-beta1.tar.gz
+/tomcatjss-8.3.0.tar.gz
diff --git a/sources b/sources
index c8421cb..61bd8e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tomcatjss-8.3.0-beta1.tar.gz) = 3aa2616b6b3eb9855cf40e6feb681b4f814586b499451deb6cad730140bd6e940afdd3070ab657faf22ac2de05309e50ba1a15eb3357b4de141805d097b64e6c
+SHA512 (tomcatjss-8.3.0.tar.gz) = 92e334db1e60e1702f868c0535820c91d39db9395754c00684ccd84f76f61ecc2d11534bc98ff21e99e52733d7fd19bc9c6b4ad93411e1ff007dcb13ee7e3cce
diff --git a/tomcatjss.spec b/tomcatjss.spec
index 27423f4..15a0986 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -12,13 +12,13 @@ Name:             tomcatjss
 # Downstream release number:
 # - development/stabilization (unsupported): 0.<n> where n >= 1
 # - GA/update (supported): <n> where n >= 1
-%global           release_number 0.2
+%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 beta1
+#global           phase
 
 %undefine         timestamp
 %undefine         commit_id
@@ -26,7 +26,6 @@ Name:             tomcatjss
 Summary:          JSS Connector for Apache Tomcat
 URL:              https://github.com/dogtagpki/tomcatjss
 License:          LGPLv2+
-BuildArch:        noarch
 Version:          %{major_version}.%{minor_version}.%{update_version}
 Release:          %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 
@@ -47,6 +46,9 @@ Source:           https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?p
 #     > tomcatjss-VERSION-RELEASE.patch
 # Patch: tomcatjss-VERSION-RELEASE.patch
 
+BuildArch:        noarch
+ExclusiveArch:    %{java_arches} noarch
+
 ################################################################################
 # Java
 ################################################################################
@@ -181,6 +183,9 @@ export JAVA_HOME=%{java_home}
 
 ################################################################################
 %changelog
+* Fri Feb 10 2023 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.3.0-1
+- Rebase to Tomcat JSS 8.3.0
+
 * Wed Nov 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.3.0-0.2.beta1
 - Rebase to Tomcat JSS 8.3.0-beta1