diff --git a/Makefile b/Makefile index 5ba7cb1d5..13ab933b2 100755 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # makefile for building Argus webservices rpms #change the following two props -targetpath=/home/sfdc/argus/installed/ +targetpath=/home/sfdc/argustest/installed buildnumber=${BUILD_NUMBER} @@ -13,7 +13,7 @@ client: build-all create-argusclient-rpm build-all: rm -rf Argus - mvn install -Dmaven.test.skip=true + mvn install -Dmaven.test.skip=true -DskipDockerBuild package: create-arguswebservices-rpm create-argusclient-rpm create-argusui-rpm diff --git a/SPECS/argus-client.spec b/SPECS/argus-client.spec index 3a29957cc..b8506f191 100755 --- a/SPECS/argus-client.spec +++ b/SPECS/argus-client.spec @@ -28,7 +28,9 @@ mkdir -p %{_stagerootdir}/%{_targetdir} cp %{_topdir}/ArgusClient/target/argus-client-*-jar-with-dependencies.jar %{_stagerootdir}/%{_targetdir} %files -/%{_targetdir} +%defattr(755, sfdc, sfdc,755) +%{_targetdir}/../../../.. + %pre %post diff --git a/SPECS/argus-ui.spec b/SPECS/argus-ui.spec index 5ff8ff44e..1cfe518bc 100755 --- a/SPECS/argus-ui.spec +++ b/SPECS/argus-ui.spec @@ -28,7 +28,9 @@ mkdir -p %{_stagerootdir}/%{_targetdir} cp -r %{_topdir}/ArgusWeb/app/* %{_stagerootdir}/%{_targetdir} %files -/%{_targetdir} +%defattr(755, sfdc, sfdc,755) +%{_targetdir}/../../../.. + %pre %post diff --git a/SPECS/argus-webservices.spec b/SPECS/argus-webservices.spec index 4b1084b4b..6699a570a 100755 --- a/SPECS/argus-webservices.spec +++ b/SPECS/argus-webservices.spec @@ -28,7 +28,9 @@ mkdir -p %{_stagerootdir}/%{_targetdir} cp %{_topdir}/ArgusWebServices/target/argus-webservices-*.war %{_stagerootdir}/%{_targetdir} %files -/%{_targetdir} +%defattr(755, sfdc, sfdc,755) +%{_targetdir}/../../../.. + %pre %post