From 50acd06cc26751b658b4ed8ba3d2cafbafb1d323 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Thu, 12 Aug 2021 13:04:26 -0500
Subject: [PATCH] Rebase to TomcatJSS 8.0.0-alpha2

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

diff --git a/.gitignore b/.gitignore
index 8fce6da..17818c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ tomcatjss-1.2.0.tar.gz
 /tomcatjss-7.6.0.tar.gz
 /tomcatjss-7.6.1.tar.gz
 /tomcatjss-8.0.0-alpha1.tar.gz
+/tomcatjss-8.0.0-alpha2.tar.gz
diff --git a/sources b/sources
index f29684b..87a9eec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tomcatjss-8.0.0-alpha1.tar.gz) = 8a81631fedf593f27fb4343737300eef28f42dc6d7efca56a726a77c6523adbace52fd56f074fedadfbba1e5110228da60182835d7f1a4c219bd29c926fbe7b9
+SHA512 (tomcatjss-8.0.0-alpha2.tar.gz) = 05ea87575fa1a317ff71046ceb65a41c843a8a647e86abc7183cd7e1b64c6c379fa44160d54a4be8c374f0a4d3d5025af7e9c8700f64d4b885c23bde20accd3f
diff --git a/tomcatjss.spec b/tomcatjss.spec
index 6afad13..16b676e 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -10,8 +10,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:          0.2.alpha1%{?_timestamp}%{?_commit_id}%{?dist}
-%global           _phase -alpha1
+Release:          0.3.alpha2%{?_timestamp}%{?_commit_id}%{?dist}
+%global           _phase -alpha2
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/tomcatjss.git
@@ -121,6 +121,7 @@ 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} \
@@ -139,8 +140,11 @@ ant -f build.xml \
 
 ################################################################################
 %changelog
+* Thu Aug 12 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 8.0.0-0.3.alpha2
+- Rebase to TomcatJSS 8.0.0-alpha1
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-0.2.alpha1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Tue Jun 22 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 8.0.0-0.1
+* Tue Jun 22 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 8.0.0-0.1.alpha1
 - Rebase to TomcatJSS 8.0.0-alpha1