From fb25464fef1d0690f9120a716b9c48bcf756cd0c Mon Sep 17 00:00:00 2001
From: shimkus <m.shimkus@f5.com>
Date: Tue, 11 Jun 2019 09:00:05 -0700
Subject: [PATCH] more changes to rpm build

---
 f5-cloud-failover.spec | 24 +++++++++++++++---------
 scripts/build_rpm.sh   |  1 -
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/f5-cloud-failover.spec b/f5-cloud-failover.spec
index f0b2192d..579bc480 100644
--- a/f5-cloud-failover.spec
+++ b/f5-cloud-failover.spec
@@ -1,5 +1,5 @@
-Summary: F5 Cloud Failover 0.9.0 Extension
-Version: 0.9.0
+Summary: F5 Cloud Failover Extension
+Version: %{_version}
 Name: %{_name}
 Release: %{_release}
 BuildArch: noarch
@@ -10,21 +10,27 @@ Packager: F5 Networks <support@f5.com>
 %description
 CLoud Failover for BIG-IP
 
-%define IAPP_INSTALL_DIR /var/config/rest/iapps/%{_name}
+%define IAPP_INSTALL_DIR /var/config/rest/iapps/%{name}
+%define _rpmfilename %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
+%define _unpackaged_files_terminate_build 0
 
 %prep
-mkdir -p %{_builddir}/src/nodejs/
-cp -r %{main}/src/ %{_builddir}/
-if [ -d "%{main}/node_modules" ] ; then cp -r %{main}/node_modules %{_builddir}/src/nodejs/ ; fi
-echo -n %{_version}-%{_release} > %{_builddir}/src/version
+rm -rf %{_builddir}/*
+cp %{main}/src/manifest.json %{_builddir}
+cp -r %{main}/src/nodejs %{_builddir}
+cp %{main}/package.json %{_builddir}
+cp -r %{main}/node_modules %{_builddir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{IAPP_INSTALL_DIR}
-cp -r %{_builddir}/src/* $RPM_BUILD_ROOT%{IAPP_INSTALL_DIR}
+cp %{_builddir}/manifest.json $RPM_BUILD_ROOT%{IAPP_INSTALL_DIR}
+cp %{_builddir}/package.json $RPM_BUILD_ROOT%{IAPP_INSTALL_DIR}
+cp -r %{_builddir}/node_modules $RPM_BUILD_ROOT%{IAPP_INSTALL_DIR}
+cp -r %{_builddir}/nodejs $RPM_BUILD_ROOT%{IAPP_INSTALL_DIR}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
diff --git a/scripts/build_rpm.sh b/scripts/build_rpm.sh
index 39a700ef..0a3fe644 100755
--- a/scripts/build_rpm.sh
+++ b/scripts/build_rpm.sh
@@ -8,7 +8,6 @@ mkdir -p ${FINALBUILDDIR}
 RELEASE='1'
 VERSION=$(cat ${MAINDIR}/package.json | jq .version -r)
 PKG_NAME=$(cat ${MAINDIR}/package.json | jq .name -r)
-
 rpmbuild -bb \
     --define "main $(pwd)" \
     --define '_topdir %{main}/rpmbuild' \