Modifying spec file to rely on Common module, and copying the code from it once insta...

Change-Id: Ie40fc0f2414d639b8857744ddf2ea96200f40321

diff --git a/Makefile b/Makefile
index 3ad55f5..8889bd4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,6 @@ INSTALL_FILES = $(PROJECT).wgt
 INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets
 
 wgtPkg:
-       cp -r ${DESTDIR}/opt/usr/apps/_common/js/services js/
-       cp -r ${DESTDIR}/opt/usr/apps/_common/css/* css/
        zip -r $(PROJECT).wgt config.xml css icon.png images index.html js templates
 
 install:

diff --git a/config.xml b/config.xml
index 010767f..d1563d2 100644 (file)
--- a/config.xml
+++ b/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" id="http://com.intel.tizen/navigationgoogle" version="1.0.0" viewmodes="fullscreen">
     <access origin="*" subdomains="true"/>
-    <tizen:application id="html5POC08.html5UINav" package="html5POC08" required_version="2.1"/>
+    <tizen:application id="html5POC08.Nav" package="html5POC08" required_version="2.1"/>
     <content src="index.html"/>
     <icon src="icon.png"/>
     <name>Navigation</name>

diff --git a/icon.png b/icon.png
index 15105a0..fda31dc 100644 (file)
Binary files a/icon.png and b/icon.png differ

diff --git a/packaging/html5-ui-nav.changes b/packaging/html5-ui-nav.changes
index cf13247..94e2f1a 100644 (file)
--- a/packaging/html5-ui-nav.changes
+++ b/packaging/html5-ui-nav.changes
@@ -1,3 +1,7 @@
+* Wed Mar 12 2014 brianjjones <brian.j.jones@intel.com> submit/tizen/20140307.000913@8a07ba3
+- Modifying spec file to rely on Common module, and copying the code from it once installed.
+- Initial commit of the Navigation app
+
 * Thu Mar 06 2014 brianjjones <brian.j.jones@intel.com> 89f9c11
 - Initial commit of the Navigation app
 

diff --git a/packaging/html5-ui-nav.spec b/packaging/html5-ui-nav.spec
index 74e3fa0..9d9589c 100644 (file)
--- a/packaging/html5-ui-nav.spec
+++ b/packaging/html5-ui-nav.spec
@@ -7,9 +7,10 @@ License:    Apache 2.0
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  zip
-BuildRequires:  html5_UI_Common
+Requires:   html5_UI_Common
 Requires:   wrt-installer
 Requires:   wrt-plugins-ivi
+Requires:   wrt-plugins-tizen-bt
 
 %description
 A proof of concept pure html5 UI
@@ -27,6 +28,8 @@ rm -rf %{buildroot}
 
 %post
     wrt-installer -i /opt/usr/apps/.preinstallWidgets/html5UINav.wgt;
+    cp -r /opt/usr/apps/_common/js/services /opt/usr/apps/html5POC08/res/wgt/js/
+    cp -r /opt/usr/apps/_common/css/* /opt/usr/apps/html5POC08/res/wgt/css/
 
 %postun
     wrt-installer -un html5POC08.Nav