From 17d7eb6a55d0b8948edb8ac00297e529d923020b Mon Sep 17 00:00:00 2001
From: brianjjones <brian.j.jones@intel.com>
Date: Fri, 9 May 2014 16:33:04 -0700
Subject: [PATCH] Fixing paths and adding un-install section

Change-Id: Iaf6bb17abc44a67ef32db67c3c3acdd63b686139
Signed-off-by: brianjjones <brian.j.jones@intel.com>
---
 packaging/.modello-installer.spec.swp | Bin 12288 -> 0 bytes
 packaging/modello-installer.changes   |   4 +++
 packaging/modello-installer.spec      |  48 +++++++++++++++++++++++++++-------
 3 files changed, 42 insertions(+), 10 deletions(-)
 delete mode 100644 packaging/.modello-installer.spec.swp

diff --git a/packaging/.modello-installer.spec.swp b/packaging/.modello-installer.spec.swp
deleted file mode 100644
index 9044dd46ab778562a7a07c6da88280f2c4b7fbad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2zi$*r6vrQq2qDCPLPI%tIVD)^?%4<ttfX*)Ax2;%pTTsnzMb<8-rHSfW^*<O
z<WyA2KR}VxiIfr~QV=DSi9`<#G)VjfNJN6~-0dAc$v#n}iS<VM*n65cKi+4b3)^q0
zdTI8&I1wBpjQvE#d{lcpvQ8%t5-nZJQfb`8@KH+&(_FJUONYnZ?rs<^G_{l$nrD;^
z&u6hrk}RB?S?oPunN5w2l0@n-kLoMYvPzf3RyWR9y}7{TvOfGco@E1UV8FmA9h;n}
zdSi#gfln_E%<u;`zy{a=8(;%$fDNz#Hoyk9zX6-?pf^Z!1bhj0l;9f=Hoykh02^Qf
zY=8~00XDz}*Z><~18iWM7>Ht`haVIDwFe2||Nri90MGXk{Q-UhKZA9kz_;KK_z>&_
zul6DqJOfX_@8ALW1+0Np5QEcT1{?<hd;mtk>rtZn;2!u1+y!^Q_h21d1@qt}_yUZB
ze?P%G@Dlt3{ss@hui!`U1GocDfp35h#=$7~2<!qckn2<M2)Mle1U%RP8(;%$fDNz#
zHoykh!2iWSC6<lITK&0yRA-s(e({e`rJ)jOL|a?(zCL?lZl)&UEd9(1+f?a_m=&p%
zvHO4?Urb06<-m$wr>*dnIGiYB5kZYi3->HkDh_v>b6tOM?@4?m8Y+!NnB_Jsj1Hqb
zH(`)#S+?yis(4vi6AC|#T2hRa-M`~wRLL_OvEiDymK3Y)C|Rl7L^P$Aq+7z*4N<wd
zRH!6&nckvGxpOB;Dm#abC^r^`LG!S<?6x6TGIgzTtFp8kUMpIyNUu$a1)Q}wzaYMo
z+PK-Q(chumQfgeW(~T_MT7j!>W!)>acP_snqb<aH9rNDqey)Atm?3Wq<=%hb+<PDC
z-e%UlzV>dC<PA0NRJ~K*TQXq(vU^3t{o}gj3n+J}7-@@K_}5WRs0vq7xBSY@@+G1+
zP<T1@ib87PT$YtFP!0GkQ(iBWmSze+02_)QYp9kLx-P43W|Kn#8|h%_#w1;wKi3Iy
zVNGlEsW5D}+ksU#WEy08na-)YOpWXWO(PSO++<LtGde5sa^-ZMC#oK~0ySZ6%~;vO
o%@P@v%O>bjw?I4b)u0+oP~RfX?bqr+rgQMpyIPt3yB2$T3me6_oB#j-

diff --git a/packaging/modello-installer.changes b/packaging/modello-installer.changes
index e69de29..11d38cf 100644
--- a/packaging/modello-installer.changes
+++ b/packaging/modello-installer.changes
@@ -0,0 +1,4 @@
+* Fri May 09 2014 brianjjones <brian.j.jones@intel.com> submit/tizen_ivi/20140509.233232@7e92052
+- Fixing paths and adding un-install section
+- Initial checkin
+
diff --git a/packaging/modello-installer.spec b/packaging/modello-installer.spec
index 3246475..da49879 100644
--- a/packaging/modello-installer.spec
+++ b/packaging/modello-installer.spec
@@ -19,26 +19,52 @@ Installer for Modello
 %package xwalk
 Summary: The Xwalk version of Modello Installer
 Requires:   crosswalk
+Requires:   Modello_AMBSimulator
+Requires:   Modello_Appmanager
+Requires:   Modello_Common
+Requires:   Modello_Dashboard
+Requires:   Modello_Homescreen
+Requires:   Modello_Hvac
+Requires:   Modello_Multimediaplayer
+Requires:   Modello_Nav
+Requires:   Modello_Phone
+Requires:   Modello_SDL
+Requires:   tizen-platform-config
 
 %description xwalk
 Installs Modello using Xwalk
 
 %post xwalk
 
-for list in $(find /opt/usr/apps/.preinstallWidgets/ -name "Modello*")
+source %_sysconfdir/tizen-platform.conf
+
+for list in $(find $TZ_SYS_APP_PREINSTALL -name "Modello*")
 do
-	#XWalk requires you be app to install files
-	su app -c "xwalkctl -i $list"
+	#XWalk requires you not be root to install files
+	echo "Installing $list"
+	su "$TZ_USER_NAME" -c "xwalkctl -i $list"
 done
 
-for list2 in $(ls -d /opt/home/app/.config/xwalk-service/applications/*/)
+for list2 in $(ls -d $TZ_SYS_HOME/$TZ_USER_NAME/.config/xwalk-service/applications/*/)
 do
         mkdir -p "$list2/css"
 	mkdir -p "$list2/js"
-	cp -r /opt/usr/apps/_common/js/services "$list2/js/"
-	cp -r /opt/usr/apps/_common/css/* "$list2/css/"
+	cp -r $TZ_USER_APP/_common/js/services "$list2/js/"
+	cp -r $TZ_USER_APP/_common/css/* "$list2/css/"
+done
+
+%postun xwalk
+
+source %_sysconfdir/tizen-platform.conf
+
+for list3 in $(su "$TZ_USER_NAME" -c "xwalkctl" | grep Modello | cut -c 1-32)
+do
+	echo "Uninstalling $list3"
+	su "$TZ_USER_NAME" -c "xwalkctl -u $list3"
 done
 
+#------------------------------------------------------------------------------------
+
 %package wrt
 Summary: The WRT version of Modello Installer
 Requires:   wrt-installer
@@ -48,18 +74,20 @@ Installs Modello using wrt-installer
 
 %post wrt
 
-for list in $(find /opt/usr/apps/.preinstallWidgets/ -name "Modello*")
+source %_sysconfdir/tizen-platform.conf
+
+for list in $(find $TZ_SYS_APP_PREINSTALL -name "Modello*")
 do
 	#wrt-installer requires you be root to install files
         wrt-installer -i $list
 done
 
-for list2 in $(ls -d /opt/usr/apps/*/)
+for list2 in $(ls -d $TZ_USER_APP/*/)
 do
         mkdir -p "$list2/css"
         mkdir -p "$list2/js"
-        cp -r /opt/usr/apps/_common/js/services "$list2/res/wgt/js/"
-        cp -r /opt/usr/apps/_common/css/* "$list2/res/wgt/css/"
+        cp -r $TZ_USER_APP/_common/js/services "$list2/res/wgt/js/"
+        cp -r $TZ_USER_APP/_common/css/* "$list2/res/wgt/css/"
 done
 
 %files xwalk
-- 
2.7.4