[rpms/jss] pqc: Rebase to JSS v4.7.2

[rpms/jss] pqc: Rebase to JSS v4.7.2

[Alexander Scheel]

            A new commit has been pushed.

            Repo   : rpms/jss
            Branch : pqc
            Commit : 1aaa1081587204a36830513aaf32cc6ed154cf1d
            Author : Alexander Scheel <ascheel@redhat.com>
            Date   : 2020-08-18T13:56:49-04:00
            Stats  : +12/-8 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/jss/c/1aaa1081587204a36830513aaf32cc6ed154cf1d?branch=pqc

            Log:
            Rebase to JSS v4.7.2

Signed-off-by: Alexander Scheel <ascheel@redhat.com>

---
diff --git a/.gitignore b/.gitignore
index a9ae250..d7eb920 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ jss-4.2.6.tar.gz
 /jss-4.7.0-b2.tar.gz
 /jss-4.7.0-b4.tar.gz
 /jss-4.7.0.tar.gz
+/jss-4.7.2.tar.gz

diff --git a/jss.spec b/jss.spec
index 93db0ad..2b099c7 100644
--- a/jss.spec
+++ b/jss.spec
@@ -6,8 +6,8 @@ Summary:        Java Security Services (JSS)
 URL:            http://www.dogtagpki.org/wiki/JSS
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
-Version:        4.7.0
-Release:        4%{?_timestamp}%{?_commit_id}%{?dist}
+Version:        4.7.2
+Release:        1%{?_timestamp}%{?_commit_id}%{?dist}
 #global         _phase -a1
 
 # To generate the source tarball:
@@ -109,12 +109,12 @@ export CFLAGS
 modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENABLED=1
 
 # The Makefile is not thread-safe
-rm -rf build && mkdir -p build && cd build
 %cmake \
     -DJAVA_HOME=%{java_home} \
     -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
-    ..
+    -B %{_vpath_builddir}
 
+cd %{_vpath_builddir}
 %{__make} all
 %{__make} javadoc
 ctest --output-on-failure
@@ -126,19 +126,19 @@ ctest --output-on-failure
 
 # jars
 install -d -m 0755 $RPM_BUILD_ROOT%{_jnidir}
-install -m 644 build/jss4.jar ${RPM_BUILD_ROOT}%{_jnidir}/jss4.jar
+install -m 644 %{_vpath_builddir}/jss4.jar ${RPM_BUILD_ROOT}%{_jnidir}/jss4.jar
 
 # We have to use the name libjss4.so because this is dynamically
 # loaded by the jar file.
 install -d -m 0755 $RPM_BUILD_ROOT%{_libdir}/jss
-install -m 0755 build/libjss4.so ${RPM_BUILD_ROOT}%{_libdir}/jss/
+install -m 0755 %{_vpath_builddir}/libjss4.so ${RPM_BUILD_ROOT}%{_libdir}/jss/
 pushd  ${RPM_BUILD_ROOT}%{_libdir}/jss
     ln -fs %{_jnidir}/jss4.jar jss4.jar
 popd
 
 # javadoc
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp build/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -rp %{_vpath_builddir}/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -p jss.html $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
@@ -160,6 +160,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 ################################################################################
 %changelog
+* Tue Aug 18 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.2-1
+- Rebase to upstream stable release JSS v4.7.2 ; fixes FTBFS
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0-4
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

diff --git a/sources b/sources
index 7f6e516..1f22225 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jss-4.7.0.tar.gz) = 91a6bbc2c9dde436fd07e2f2bf9e71bd0a40c643547f41a95152a51200d126a37e2e580ef78d9075dc349f5dfe613b04eaf2a32009da13889e824ee9db255a43
+SHA512 (jss-4.7.2.tar.gz) = 171b4c341b56c49eaedf0663cee7c949bd91f070781debc80b7b74f85eeacc5e4092cc5ab8eb3ace926493a7ea64d08c5c7a614dccd2e479f8b371b6075d6594