From b66bd7af3e4547518553bfb1896797cf68f3bcbc Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@unidata.ucar.edu>
Date: Thu, 6 Sep 2018 19:35:34 -0600
Subject: [PATCH] Revert "component.spec file build from github release
 tarball"

This reverts commit e119769c84a22430d72ba06ee824441cff542466.
---
 component.spec | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/component.spec b/component.spec
index 14e5d82..4d2c62c 100644
--- a/component.spec
+++ b/component.spec
@@ -52,11 +52,8 @@ fi
 mkdir -p %{_python_build_loc}
 
 %build
-#AWIPS_SRC_DIR="%{_baseline_workspace}/python-awips"
-#cp -R ${AWIPS_SRC_DIR} %{_python_build_loc}/
-cd %{_python_build_loc}
-wget https://github.com/Unidata/python-awips/archive/18.1.1.tar.gz
-tar -xvzf 18.1.1.tar.gz
+AWIPS_SRC_DIR="%{_baseline_workspace}/python-awips"
+cp -R ${AWIPS_SRC_DIR} %{_python_build_loc}/
 RC=$?
 if [ ${RC} -ne 0 ]; then
    exit 1
@@ -69,7 +66,7 @@ if [ ${RC} -ne 0 ]; then
 fi
 
 pushd . > /dev/null
-cd %{_python_build_loc}/python-awips-18.1.1
+cd %{_python_build_loc}/python-awips
 /awips2/python/bin/python setup.py clean
 RC=$?
 if [ ${RC} -ne 0 ]; then
@@ -83,15 +80,11 @@ fi
 popd > /dev/null
 
 %install
+AWIPS_SRC_DIR="%{_baseline_workspace}/python-awips"
+
 pushd . > /dev/null
-cd %{_python_build_loc}/python-awips-18.1.1
-
-source /etc/profile.d/awips2.sh
-RC=$?
-if [ ${RC} -ne 0 ]; then
-   exit 1
-fi
-
+cd %{_python_build_loc}/python-awips
+export LD_LIBRARY_PATH=/awips2/python/lib
 /awips2/python/bin/python setup.py install \
    --root=%{_build_root} \
    --prefix=/awips2/python
@@ -101,8 +94,6 @@ if [ ${RC} -ne 0 ]; then
 fi
 popd > /dev/null
 
-ls -altr /awips2/jenkins/buildspace/workspace/tmp/awips/awips-component/awips2/python/lib/python2.7/site-packages
-
 %pre
 
 %post