Moved pki.spec.in

The pki.spec.in has been moved into the top-level directory and
renamed into pki.spec for consistency with other projects.

Change-Id: I90c8fa3cbc955ce9eadcfb101c1f029e7f782c31

Author: edewata

base/common/python/setup.py

@@ -24,7 +24,7 @@
   $ sudo yum install python-wheel python-setuptools
 
 The 'release' alias builds and uploads a source distribution and universal
-wheel. The version and release number are taken from pki-core.spec.in file.
+wheel. The version and release number are taken from pki.spec file.
 
   $ python setup.py release
 
@@ -51,7 +51,7 @@ class VersionInfo(Command):
 
     version_re = re.compile('^Version:\s*(\d+\.\d+\.\d+)')
     release_re = re.compile('^Release:.*?([\d\.]+)')
-    specfile = '../../../specs/pki-core.spec.in'
+    specfile = '../../../pki.spec'
 
     def initialize_options(self):
         self.rpm_version = None

build.sh

@@ -323,7 +323,7 @@ if [ "$DEBUG" = true ] ; then
 fi
 
 if [ "$SPEC_TEMPLATE" = "" ] ; then
-    SPEC_TEMPLATE="$SRC_DIR/specs/pki.spec.in"
+    SPEC_TEMPLATE="$SRC_DIR/pki.spec"
 fi
 
 VERSION="`rpmspec -P "$SPEC_TEMPLATE" | grep "^Version:" | awk '{print $2;}'`"

specs/pki.spec.in pki.spec

@@ -15,7 +15,7 @@ function upload {
 
 echo "Installing PKI build dependencies"
 
-dnf builddep -y --allowerasing --spec ${BUILDDIR}/pki/specs/pki.spec.in
+dnf builddep -y --allowerasing --spec ${BUILDDIR}/pki/pki.spec
 
 echo "Building PKI packages"