Rebase to JSS 5.2.0-beta2

Resolves: #2075167

.gitignore

@@ -41,3 +41,4 @@ jss-4.2.6.tar.gz
 /jss-5.0.2.tar.gz
 /jss-5.0.3.tar.gz
 /jss-5.2.0-beta1.tar.gz
+/jss-5.2.0-beta2.tar.gz

jss.spec

@@ -2,15 +2,32 @@
 Name:           jss
 ################################################################################
 
+%global         product_id idm-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 +36,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 \
@@ -73,6 +90,17 @@ BuildRequires:  apache-commons-lang3
 
 BuildRequires:  junit
 
+%description
+Java Security Services (JSS) is a java native interface which provides a bridge
+for java-based applications to use native Network Security Services (NSS).
+This only works with gcj. Other JREs require that JCE providers be signed.
+
+################################################################################
+%package -n %{product_id}
+################################################################################
+
+Summary:        Java Security Services (JSS)
+
 Requires:       nss >= 3.66
 Requires:       %{java_headless}
 Requires:       jpackage-utils
@@ -80,25 +108,30 @@ Requires:       slf4j
 Requires:       slf4j-jdk14
 Requires:       apache-commons-lang3
 
+Obsoletes:      jss < %{version}-%{release}
+Provides:       jss = %{version}-%{release}
+
 Conflicts:      ldapjdk < 4.20
 Conflicts:      idm-console-framework < 1.2
 Conflicts:      tomcatjss < 7.6.0
 Conflicts:      pki-base < 10.10.0
 
-%description
+%description -n %{product_id}
 Java Security Services (JSS) is a java native interface which provides a bridge
 for java-based applications to use native Network Security Services (NSS).
 This only works with gcj. Other JREs require that JCE providers be signed.
 
 %if %{with javadoc}
 ################################################################################
-%package javadoc
+%package -n %{product_id}-javadoc
 ################################################################################
 
 Summary:        Java Security Services (JSS) Javadocs
-Requires:       jss = %{version}-%{release}
 
-%description javadoc
+Obsoletes:      jss-javadoc < %{version}-%{release}
+Provides:       jss-javadoc = %{version}-%{release}
+
+%description -n %{product_id}-javadoc
 This package contains the API documentation for JSS.
 %endif
 
@@ -106,7 +139,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
@@ -155,7 +188,7 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA
     install
 
 ################################################################################
-%files
+%files -n %{product_id}
 ################################################################################
 
 %defattr(-,root,root,-)
@@ -166,16 +199,19 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA
 
 %if %{with javadoc}
 ################################################################################
-%files javadoc
+%files -n %{product_id}-javadoc
 ################################################################################
 
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}/
+%{_javadocdir}/jss/
 %endif
 
 ################################################################################
 %changelog
-%changelog
+* Mon May 02 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-0.3.beta2
+- Rebase to JSS 5.2.0-beta2
+- Rename packages to idm-jss
+
 * Wed Apr 13 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.2.0-0.2.beta1
 - Rebase to JSS 5.2.0-beta1
 

sources

@@ -1 +1 @@
-SHA512 (jss-5.2.0-beta1.tar.gz) = be6f4612567676e797bb07a00cbc8e6ebab4e930770e00514152e5c3389a0484dcc3eb959c3c57d33d12ed38fbf160a02c69d1c6d5c7b40b93b9fe90cbf0bbb3
+SHA512 (jss-5.2.0-beta2.tar.gz) = da0ff4cd544cb9d339995251f48a4e402f44ab838beacfc96a2d92bb32a6581c81c005bc075fb8cfa5220d2c92e332a946f28b7aa1be61ec2671c396d721e48f