From 5231daa95560e92d6cd5b2aaf3c6131da96b8b5d Mon Sep 17 00:00:00 2001
From: Endi S. Dewata <edewata@redhat.com>
Date: Apr 12 2018 01:00:05 +0000
Subject: Rebased to PKI 10.6.0


---

diff --git a/pki-core.spec b/pki-core.spec
index 9a1161c..f90d2fe 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -8,20 +8,13 @@ License:          GPLv2
 
 %if 0%{?rhel}
 Version:          10.6.0
-Release:          0.3%{?_timestamp}%{?_commit}%{?dist}
+Release:          1%{?_timestamp}%{?_commit}%{?dist}
 %else
 Version:          10.6.0
-Release:          0.3%{?_timestamp}%{?_commit}%{?dist}
+Release:          1%{?_timestamp}%{?_commit}%{?dist}
 %endif
 
-Source:           https://github.com/dogtagpki/pki/archive/v%{version}-beta2/pki-%{version}-beta2.tar.gz
-
-# Obtain version phase number (e. g. - used by "alpha", "beta", etc.)
-#
-#     NOTE:  For "alpha" releases, will be ".a1", ".a2", etc.
-#            For "beta" releases, will be ".b1", ".b2", etc.
-#
-%define version_phase "%(echo `echo %{version} | awk -F. '{ print $4 }'`)"
+Source:           https://github.com/dogtagpki/pki/archive/v%{version}/pki-%{version}.tar.gz
 
 ################################################################################
 # Python
@@ -785,7 +778,7 @@ This package contains PKI API documentation.
 %prep
 ################################################################################
 
-%autosetup -n pki-%{version}-beta2 -p 1
+%autosetup -n pki-%{version} -p 1
 
 ################################################################################
 %build
@@ -795,9 +788,6 @@ This package contains PKI API documentation.
 cd build
 %cmake \
     -DVERSION=%{version}-%{release} \
-%if %{version_phase}
-    -DAPPLICATION_VERSION_PHASE="%{version_phase}" \
-%endif
     -DVAR_INSTALL_DIR:PATH=/var \
     -DJAVA_HOME=%{java_home} \
     -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
@@ -933,20 +923,20 @@ fi
 
 %if 0%{?with_python3_default}
 # Scanning the python code with pylint.
-%{__python3} ../pylint-build-scan.py rpm --prefix %{buildroot}
+%{__python3} ../tools/pylint-build-scan.py rpm --prefix %{buildroot}
 if [ $? -ne 0 ]; then
     echo "pylint for Python 3 failed. RC: $?"
     exit 1
 fi
 %else
 # Scanning the python code with pylint.
-%{__python2} ../pylint-build-scan.py rpm --prefix %{buildroot}
+%{__python2} ../tools/pylint-build-scan.py rpm --prefix %{buildroot}
 if [ $? -ne 0 ]; then
     echo "pylint for Python 2 failed. RC: $?"
     exit 1
 fi
 
-%{__python2} ../pylint-build-scan.py rpm --prefix %{buildroot} -- --py3k
+%{__python2} ../tools/pylint-build-scan.py rpm --prefix %{buildroot} -- --py3k
 if [ $? -ne 0 ]; then
     echo "pylint for Python 2 with --py3k failed. RC: $?"
     exit 1
@@ -1350,9 +1340,10 @@ fi
 %changelog
 ################################################################################
 
-* Mon Apr 9 2018 Dogtag PKI Team <pki-devel@redhat.com> - 10.6.0-0.4
+* Wed Apr 11 2018 Dogtag PKI Team <pki-devel@redhat.com> - 10.6.0-1
 - Updated project URL and package descriptions
 - Cleaned up spec file
+- Rebased to PKI 10.6.0 final
 
 * Thu Mar 29 2018 Dogtag PKI Team <pki-devel@redhat.com> - 10.6.0-0.3
 - Iryna Shcherbina <ishcherb@redhat.com>: Update Python 2 dependency declarations to new packaging standards
diff --git a/sources b/sources
index e134223..f5bcdd5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pki-10.6.0-beta2.tar.gz) = 6c7533f8a944560a8e4bdc89d7b357a91f7841d28b228503cbc39711ae40857a27e8067c51faea9f2c555a3723aaa81ce1802d4ffc55b16b9bd9c90cb64ae077
+SHA512 (pki-10.6.0.tar.gz) = a1f26954f4a35d350675766d1091fc92fa9a92a89685485526fa57cd6b50e8a0085e146ce2388103a254f50addc2b218038b1da00e037f7d3c6e2c7423e4bdca