[rpms/jss] pqc: Rebased to JSS 4.5.0-a1

[Endi S. Dewata <edewata@redhat.com>]

A new commit has been pushed.

Repo   : rpms/jss
Branch : pqc
Commit : 7090fef2a78fe32bd338207a61ea83cb44b7f942
Author : Endi S. Dewata <edewata@redhat.com>
Date   : 2018-06-16T00:55:26+02:00
Stats  : +45/-29 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/jss/c/7090fef2a78fe32bd338207a61ea83cb44b7f942?branch=pqc

Log:
Rebased to JSS 4.5.0-a1

---
diff --git a/.gitignore b/.gitignore
index 7778c28..5d191ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ jss-4.2.6.tar.gz
 /jss-4.4.2.tar.gz
 /jss-4.4.3.tar.gz
 /jss-4.4.4.tar.gz
+/jss-4.5.0-a1.tar.gz

diff --git a/jss.spec b/jss.spec
index 7179c51..dc5560a 100644
--- a/jss.spec
+++ b/jss.spec
@@ -6,16 +6,26 @@ Summary:        Java Security Services (JSS)
 URL:            http://www.dogtagpki.org/wiki/JSS
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
-Version:        4.4.4
-Release:        1%{?_timestamp}%{?_commit_id}%{?dist}
+Version:        4.5.0
+Release:        0.1%{?_timestamp}%{?_commit_id}%{?dist}
+%global         _phase -a1
 
 # To generate the source tarball:
-#
-# git clone https://github.com/dogtagpki/jss.git
-# cd jss
-# git archive --format=tar.gz --prefix jss-VERSION/jss/ -o jss-VERSION.tar.gz -v HEAD
-#
-Source:         https://github.com/dogtagpki/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
+# $ git clone https://github.com/dogtagpki/jss.git
+# $ cd jss
+# $ git archive \
+#     --format=tar.gz \
+#     --prefix jss-VERSION/ \
+#     -o jss-VERSION.tar.gz \
+#     <version tag>
+Source:         https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phase}/%{name}-%{version}%{?_phase}.tar.gz
+
+# To create a patch for all changes since a version tag:
+# $ git format-patch \
+#     --stdout \
+#     <version tag> \
+#     > jss-VERSION-RELEASE.patch
+# Patch: jss-VERSION-RELEASE.patch
 
 Conflicts:      idm-console-framework < 1.1.17-4
 Conflicts:      pki-base < 10.4.0
@@ -28,6 +38,12 @@ BuildRequires:  nss-devel >= 3.28.4-6
 BuildRequires:  nspr-devel >= 4.13.1
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
+BuildRequires:  slf4j
+%if 0%{?fedora} || 0%{?rhel} > 7
+BuildRequires:  slf4j-jdk14
+%endif
+BuildRequires:  apache-commons-lang
+
 %if 0%{?fedora} >= 25 || 0%{?rhel} > 7
 BuildRequires:  perl-interpreter
 %endif
@@ -35,6 +51,11 @@ BuildRequires:  perl-interpreter
 Requires:       nss >= 3.28.4-6
 Requires:       java-headless
 Requires:       jpackage-utils
+Requires:       slf4j
+%if 0%{?fedora} || 0%{?rhel} > 7
+Requires:       slf4j-jdk14
+%endif
+Requires:       apache-commons-lang
 
 %description
 Java Security Services (JSS) is a java native interface which provides a bridge
@@ -55,7 +76,7 @@ This package contains the API documentation for JSS.
 ################################################################################
 %prep
 
-%autosetup -n %{name}-%{version} -p 1 -S git
+%autosetup -n %{name}-%{version}%{?_phase} -p 1 -S git
 
 ################################################################################
 %build
@@ -66,10 +87,7 @@ This package contains the API documentation for JSS.
 [ -z "$USE_INSTALLED_NSPR" ] && export USE_INSTALLED_NSPR=1
 [ -z "$USE_INSTALLED_NSS" ] && export USE_INSTALLED_NSS=1
 
-# Enable compiler optimizations and disable debugging code
-# NOTE: If you ever need to create a debug build with optimizations disabled
-# just comment out this line and change in the %%install section below the
-# line that copies jars xpclass.jar to be xpclass_dbg.jar
+# Enable compiler optimizations
 export BUILD_OPT=1
 
 # Generate symbolic info for debuggers
@@ -99,45 +117,39 @@ export USE_64
 %endif
 
 # The Makefile is not thread-safe
-make -C jss/coreconf
-make -C jss
-make -C jss javadoc
+make -C coreconf
+make
+make javadoc
 
 ################################################################################
 %install
 
-# Copy the license files here so we can include them in %%doc
-cp -p jss/MPL-1.1.txt .
-cp -p jss/gpl.txt .
-cp -p jss/lgpl.txt .
-
 # There is no install target so we'll do it by hand
 
 # jars
 install -d -m 0755 $RPM_BUILD_ROOT%{_jnidir}
-# NOTE: if doing a debug no opt build change xpclass.jar to xpclass_dbg.jar
-install -m 644 dist/xpclass.jar ${RPM_BUILD_ROOT}%{_jnidir}/jss4.jar
+install -m 644 ../dist/xpclass.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 dist/Linux*.OBJ/lib/libjss4.so ${RPM_BUILD_ROOT}%{_libdir}/jss/
+install -m 0755 ../dist/Linux*.OBJ/lib/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 dist/jssdoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -p jss/jss.html $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -p jss/*.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -rp ../dist/jssdoc/* $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}
 
 # No ldconfig is required since this library is loaded by Java itself.
 ################################################################################
 %files
 
 %defattr(-,root,root,-)
-%doc jss/jss.html jss/MPL-1.1.txt jss/gpl.txt jss/lgpl.txt
+%doc jss.html MPL-1.1.txt gpl.txt lgpl.txt
 %{_libdir}/jss/*
 %{_jnidir}/*
 %{_libdir}/jss/lib*.so
@@ -152,6 +164,9 @@ cp -p jss/*.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ################################################################################
 %changelog
 
+* Fri Jun 15 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.1
+- Rebased to JSS 4.5.0-a1
+
 * Tue May 29 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.4.4-1
 - Rebased to JSS 4.4.4
 

diff --git a/sources b/sources
index 2638641..607af78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jss-4.4.4.tar.gz) = 206a2f26239a647b36f19277e2eebb73bfbd3bc436dabe708423498fb509956618a99c6f0532e47c7b7ddda71652612a450f7490b809866339a1d3827f7e2f51
+SHA512 (jss-4.5.0-a1.tar.gz) = f5a8649c07392425b6f16a5fab33e6775428c90d26bfbeb442d31992ed4ef214c84b727dca6eda9924a95fe0e4a8f83a28661a2d9d5b5f15e73886f7eec1a87f