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

Change-Id: I25618bba247b733e4986548856c3fe44231d8f3d

diff --git a/Makefile b/Makefile
index 5dbf4c1..a6e29b7 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 index.html js templates
 
 install:

diff --git a/icon.png b/icon.png
index fe38f7e..ccd5624 100644 (file)
Binary files a/icon.png and b/icon.png differ

diff --git a/packaging/html5-ui-appmanager.changes b/packaging/html5-ui-appmanager.changes
index 81132a1..fb2e71f 100644 (file)
--- a/packaging/html5-ui-appmanager.changes
+++ b/packaging/html5-ui-appmanager.changes
@@ -1,3 +1,7 @@
+* Wed Mar 12 2014 brianjjones <brian.j.jones@intel.com> submit/tizen/20140311.165037@624e75d
+- Modifying spec file to rely on Common module, and copying the code from it once installed.
+- Add DISCLAIMER (per Open-Source PDT AR)
+
 * Thu Mar 06 2014 brianjjones <brian.j.jones@intel.com> c8620ac
 - Initial commit of the Appmanager app
 

diff --git a/packaging/html5-ui-appmanager.spec b/packaging/html5-ui-appmanager.spec
index d23ea34..ad5e402 100644 (file)
--- a/packaging/html5-ui-appmanager.spec
+++ b/packaging/html5-ui-appmanager.spec
@@ -7,10 +7,11 @@ 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/html5UIAppmanager.wgt;
+    cp -r /opt/usr/apps/_common/js/services /opt/usr/apps/html5POC03/res/wgt/js/
+    cp -r /opt/usr/apps/_common/css/* /opt/usr/apps/html5POC03/res/wgt/css/
 
 %postun
     wrt-installer -un html5POC03.Appmanager