From c89f9a99178f2a1d5cc3e0b972700ee65f11d93d Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Fri, 10 Aug 2018 22:45:48 +0200
Subject: [PATCH] Updated version number to 4.5.0-1

---
 build.sh                | 2 +-
 jss.spec.in => jss.spec | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename jss.spec.in => jss.spec (97%)

diff --git a/build.sh b/build.sh
index 7c7ef7cf8..3cfdff2c3 100755
--- a/build.sh
+++ b/build.sh
@@ -208,7 +208,7 @@ if [ "$BUILD_TARGET" != "src" ] &&
 fi
 
 if [ "$SPEC_TEMPLATE" = "" ] ; then
-    SPEC_TEMPLATE="$SRC_DIR/$NAME.spec.in"
+    SPEC_TEMPLATE="$SRC_DIR/$NAME.spec"
 fi
 
 VERSION="`rpmspec -P "$SPEC_TEMPLATE" | grep "^Version:" | awk '{print $2;}'`"
diff --git a/jss.spec.in b/jss.spec
similarity index 97%
rename from jss.spec.in
rename to jss.spec
index 1377ebbe5..fc5757c03 100644
--- a/jss.spec.in
+++ 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.6%{?_timestamp}%{?_commit_id}%{?dist}
-%global         _phase -b1
+Release:        1%{?_timestamp}%{?_commit_id}%{?dist}
+# global         _phase -a1
 
 # To generate the source tarball:
 # $ git clone https://github.com/dogtagpki/jss.git
@@ -65,9 +65,10 @@ Requires:       slf4j-jdk14
 Requires:       apache-commons-lang
 Requires:       apache-commons-codec
 
-Conflicts:      idm-console-framework < 1.1.17-4
-Conflicts:      pki-base < 10.6.5
+Conflicts:      ldapjdk < 4.20
+Conflicts:      idm-console-framework < 1.2
 Conflicts:      tomcatjss < 7.3.4
+Conflicts:      pki-base < 10.6.5
 
 %description
 Java Security Services (JSS) is a java native interface which provides a bridge