From e499f9be0bf2843994c34997f2d9d95f726ec819 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Wed, 27 Apr 2022 18:19:12 -0500
Subject: [PATCH] Rebase to JSS 5.2.0-beta2

---
 .gitignore |  1 +
 jss.spec   | 52 ++++++++++++++++++++++++++++++++++++++++++----------
 sources    |  2 +-
 3 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index ca5b012..664530f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ jss-4.2.6.tar.gz
 /jss-5.1.0-alpha2.tar.gz
 /jss-5.1.0.tar.gz
 /jss-5.2.0-beta1.tar.gz
+/jss-5.2.0-beta2.tar.gz
diff --git a/jss.spec b/jss.spec
index 0ed4ff9..42a9102 100644
--- a/jss.spec
+++ b/jss.spec
@@ -1,16 +1,31 @@
 ################################################################################
-Name:           jss
+Name:           dogtag-jss
 ################################################################################
 
+# Upstream version number:
+%global         major_version 5
+%global         minor_version 2
+%global         update_version 0
+
+# Downstream release number:
+# - development/stabilization (unsupported): 0.<n> where n >= 1
+# - GA/update (supported): <n> where n >= 1
+%global         release_number 0.3
+
+# Development phase:
+# - development (unsupported): alpha<n> where n >= 1
+# - stabilization (unsupported): beta<n> where n >= 1
+# - GA/update (supported): <none>
+%global         phase beta2
+
+%undefine       timestamp
+%undefine       commit_id
+
 Summary:        Java Security Services (JSS)
 URL:            http://www.dogtagpki.org/wiki/JSS
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
-
-# 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:        5.2.0
-Release:        0.2.beta1%{?_timestamp}%{?_commit_id}%{?dist}
-%global         _phase -beta1
+Version:        %{major_version}.%{minor_version}.%{update_version}
+Release:        %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/jss.git
@@ -19,7 +34,7 @@ Release:        0.2.beta1%{?_timestamp}%{?_commit_id}%{?dist}
 # $ git push origin v4.5.<z>
 # Then go to https://github.com/dogtagpki/jss/releases and download the source
 # tarball.
-Source:         https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phase}/%{name}-%{version}%{?_phase}.tar.gz
+Source:         https://github.com/dogtagpki/jss/archive/v%{version}%{?phase:-}%{?phase}/jss-%{version}%{?phase:-}%{?phase}.tar.gz
 
 # To create a patch for all changes since a version tag:
 # $ git format-patch \
@@ -28,6 +43,9 @@ Source:         https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
 #     > jss-VERSION-RELEASE.patch
 # Patch: jss-VERSION-RELEASE.patch
 
+# Java 17 and md2man are not available on i686
+ExcludeArch: i686
+
 ################################################################################
 # Java
 ################################################################################
@@ -77,6 +95,11 @@ Requires:       slf4j
 Requires:       slf4j-jdk14
 Requires:       apache-commons-lang3
 
+%if "%{name}" != "jss"
+Obsoletes:      jss < %{version}-%{release}
+Provides:       jss = %{version}-%{release}
+%endif
+
 Conflicts:      ldapjdk < 4.20
 Conflicts:      idm-console-framework < 1.2
 Conflicts:      tomcatjss < 7.6.0
@@ -95,6 +118,11 @@ This only works with gcj. Other JREs require that JCE providers be signed.
 Summary:        Java Security Services (JSS) Javadocs
 Requires:       jss = %{version}-%{release}
 
+%if "%{name}" != "jss"
+Obsoletes:      jss-javadoc < %{version}-%{release}
+Provides:       jss-javadoc = %{version}-%{release}
+%endif
+
 %description javadoc
 This package contains the API documentation for JSS.
 %endif
@@ -103,7 +131,7 @@ This package contains the API documentation for JSS.
 %prep
 ################################################################################
 
-%autosetup -n %{name}-%{version}%{?_phase} -p 1
+%autosetup -n jss-%{version}%{?phase:-}%{?phase} -p 1
 
 ################################################################################
 %build
@@ -167,11 +195,15 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA
 ################################################################################
 
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}/
+%{_javadocdir}/jss/
 %endif
 
 ################################################################################
 %changelog
+* Wed Apr 27 2022 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.2.0-0.3.beta2
+- Rebase to JSS 5.2.0-beta2
+- Rename packages to dogtag-jss
+
 * Mon Apr 11 2022 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.2.0-0.2.beta1
 - Rebase to JSS 5.2.0-beta1
 
diff --git a/sources b/sources
index b03417d..2711f9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jss-5.2.0-beta1.tar.gz) = be6f4612567676e797bb07a00cbc8e6ebab4e930770e00514152e5c3389a0484dcc3eb959c3c57d33d12ed38fbf160a02c69d1c6d5c7b40b93b9fe90cbf0bbb3
+SHA512 (jss-5.2.0-beta2.tar.gz) = cdb40a65e816972e0eac1055a4bd4bb5a04906dbeddfefb36d099562a7b6b9841d2fdf3b1217179f59deadeaaf5d1be16affe5f713be01f806f06cab00486917