From 73c0ab90fe6c8aebc98211b77b68f362f2f5de86 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Tue, 7 Aug 2018 17:19:08 +0200
Subject: [PATCH] Rebased to JSS 4.5.0-b1

---
 .gitignore        |  1 +
 copr-build.sh     |  9 +++++++++
 jss.spec          | 18 +++++++++++++-----
 sources           |  2 +-
 sources-update.sh |  7 +++++++
 5 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100755 copr-build.sh
 create mode 100755 sources-update.sh

diff --git a/.gitignore b/.gitignore
index c12f2fb..ce97b1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ jss-4.2.6.tar.gz
 /jss-4.5.0-a2.tar.gz
 /jss-4.5.0-a3.tar.gz
 /jss-4.5.0-a4.tar.gz
+/jss-4.5.0-b1.tar.gz
diff --git a/copr-build.sh b/copr-build.sh
new file mode 100755
index 0000000..156c705
--- /dev/null
+++ b/copr-build.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+REPO=$1
+
+if [ "$REPO" == "" ]; then
+    REPO="pki-10.6"
+fi
+
+fedpkg copr-build --nowait $REPO
diff --git a/jss.spec b/jss.spec
index 7af0455..0ac8ea0 100644
--- a/jss.spec
+++ b/jss.spec
@@ -7,8 +7,8 @@ URL:            http://www.dogtagpki.org/wiki/JSS
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
 Version:        4.5.0
-Release:        0.4%{?_timestamp}%{?_commit_id}%{?dist}
-%global         _phase -a4
+Release:        0.6%{?_timestamp}%{?_commit_id}%{?dist}
+%global         _phase -b1
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/jss.git
@@ -35,8 +35,9 @@ Source:         https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
 BuildRequires:  git
 
 BuildRequires:  gcc-c++
-BuildRequires:  nss-devel >= 3.28.4-6
 BuildRequires:  nspr-devel >= 4.13.1
+BuildRequires:  nss-devel >= 3.28.4-6
+BuildRequires:  nss-tools >= 3.28.4-6
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
 BuildRequires:  slf4j
@@ -65,8 +66,8 @@ Requires:       apache-commons-lang
 Requires:       apache-commons-codec
 
 Conflicts:      idm-console-framework < 1.1.17-4
-Conflicts:      pki-base < 10.6.3
-Conflicts:      tomcatjss < 7.3.2
+Conflicts:      pki-base < 10.6.5
+Conflicts:      tomcatjss < 7.3.4
 
 %description
 Java Security Services (JSS) is a java native interface which provides a bridge
@@ -131,6 +132,7 @@ export USE_64
 make -C coreconf
 make
 make javadoc
+make test_jss
 
 ################################################################################
 %install
@@ -172,6 +174,12 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 ################################################################################
 %changelog
+* Tue Aug 7 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.6
+- Rebased to JSS 4.5.0-b1
+
+* Tue Aug 7 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.5
+- Red Hat Bugzilla #1612063 - Do not override system crypto policy (support TLS 1.3)
+
 * Fri Jul 20 2018 Dogtag PKI Team <pki-devel@redhat.com> 4.5.0-0.4
 - Rebased to JSS 4.5.0-a4
 - Red Hat Bugzilla #1604462 - jss: FTBFS in Fedora rawhide
diff --git a/sources b/sources
index 6625c82..623be8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jss-4.5.0-a4.tar.gz) = 9a3e8adb87ff18102c7c497f8db40e07ee1efab157dae04e8b15ee49f3dc99069865a829b50ed9b4ee9ef3c649619697f88c31b8ff5461c426b63fec298d5f84
+SHA512 (jss-4.5.0-b1.tar.gz) = e5f5efbcf3e75c2e343e5531e11e131cd7704d4397adc419011eb1190d4aca44e4b9344ca2b985aaeb9823b377d01057f9736515c01d61676cd08f34dafe5300
diff --git a/sources-update.sh b/sources-update.sh
new file mode 100755
index 0000000..96129ca
--- /dev/null
+++ b/sources-update.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+SOURCE=$1
+TARGET=`basename $1`
+
+cp $SOURCE $TARGET
+sha512sum --tag $TARGET > sources