Updated Modello web samples from upstream

Package version up (3.0.26).

Change-Id: I8040f7af69f18805f6d87e3f9f5a1a1a79eac1ab
Signed-off-by: Alice Liu <alice.liu@intel.com>

diff --git a/package/changelog b/package/changelog
index 11299f6..91457aa 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 3.0.26
+* Updated Modello web samples from upstream
+== Alice Liu <alice.liu@intel.com> 2014-09-23
+
 * 3.0.25
 * Changed web samples' name and updated snapshots
 == Alice Liu <alice.liu@intel.com> 2014-09-17

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index a589ae9..5f52bd2 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:3.0.25
+Version:3.0.26
 Maintainer: Alice Liu<alice.liu@intel.com>
 
 Package:ivi-3.0-web-sample

diff --git a/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/Makefile b/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/Makefile
deleted file mode 100644 (file)
index 5a479f9..0000000
--- a/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PROJECT = Modello_AMBSimulator
-
-VERSION := 0.0.2
-PACKAGE = $(PROJECT)-$(VERSION)
-
-INSTALL_FILES = $(PROJECT).wgt
-INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets
-
-wgtPkg:
-       zip -r $(PROJECT).wgt config.xml manifest.json css AMB_Simulator_icon.png  index.html  js templates
-
-install:
-       @echo "Installing AMBSimulator, stand by..."
-       mkdir -p $(INSTALL_DIR)/
-       mkdir -p ${DESTDIR}/opt/usr/apps/_common/icons
-       cp $(PROJECT).wgt $(INSTALL_DIR)/
-       cp AMB_Simulator_icon.png ${DESTDIR}/opt/usr/apps/_common/icons
-
-dist:
-       tar czf ../$(PACKAGE).tar.bz2 .

diff --git a/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/manifest.json b/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/manifest.json
index d9c3e5c..5003d9c 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/manifest.json
+++ b/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/manifest.json
@@ -7,6 +7,6 @@
     }
   },
   "icons": {
-    "128": "AMB_Simulator_icon.png"
+    "128": "AMBSimulator_icon.png"
   }
 }

diff --git a/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/packaging/modello-ambsimulator.changes b/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/packaging/modello-ambsimulator.changes
index 9af8e4e..c7ba06d 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/packaging/modello-ambsimulator.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/packaging/modello-ambsimulator.changes
@@ -1,3 +1,8 @@
+* Thu Sep 18 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140911.180109-2-g01efa20
+- Removing old icon
+- Fixing icon name in files
+- Updating packaging to remove hard coded paths
+
 * Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215742-1-ge14cadf
 - Removing space in app name - Fix for TC-1404
 

diff --git a/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/packaging/modello-ambsimulator.spec b/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/packaging/modello-ambsimulator.spec
index 45a4a01..43c82a5 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/packaging/modello-ambsimulator.spec
+++ b/samples/web/Sample/Tizen/Web App/ModelloAMBSimulator/project/packaging/modello-ambsimulator.spec
@@ -8,6 +8,7 @@ URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  zip
 Requires:   Modello_Common
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 A proof of concept pure html5 UI
@@ -15,15 +16,14 @@ A proof of concept pure html5 UI
 %prep
 %setup -q -n %{name}-%{version}
 
-%build
-
-make wgtPkg
-
 %install
 rm -rf %{buildroot}
-%make_install
+mkdir -p %{buildroot}%{TZ_SYS_APP_PREINSTALL}
+mkdir -p %{buildroot}%{_datadir}/Modello/Common/icons
+zip -r %{buildroot}%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt config.xml manifest.json css AMBSimulator_icon.png  index.html  js templates
+install -m 0644 AMBSimulator_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
 
 %files
 %defattr(-,root,root,-)
-/opt/usr/apps/.preinstallWidgets/Modello_AMBSimulator.wgt
-/opt/usr/apps/_common/icons/AMB_Simulator_icon.png
+%{TZ_SYS_APP_PREINSTALL}/Modello_AMBSimulator.wgt
+%{_datadir}/Modello/Common/icons/AMBSimulator_icon.png

diff --git a/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/Makefile b/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/Makefile
deleted file mode 100644 (file)
index 616da5a..0000000
--- a/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PROJECT = Modello_Appmanager
-
-VERSION := 0.0.2
-PACKAGE = $(PROJECT)-$(VERSION)
-
-INSTALL_FILES = $(PROJECT).wgt
-INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets
-
-wgtPkg:
-       zip -r $(PROJECT).wgt config.xml css AppManager_icon.png index.html js templates
-
-install:
-       @echo "Installing Appmanager, stand by..."
-       mkdir -p $(INSTALL_DIR)/
-       mkdir -p ${DESTDIR}/opt/usr/apps/_common/icons
-       cp $(PROJECT).wgt $(INSTALL_DIR)/
-       cp AppManager_icon.png ${DESTDIR}/opt/usr/apps/_common/icons
-
-dist:
-       tar czf ../$(PACKAGE).tar.bz2 .

diff --git a/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/packaging/modello-appmanager.changes b/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/packaging/modello-appmanager.changes
index 86ac586..1b4c305 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/packaging/modello-appmanager.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/packaging/modello-appmanager.changes
@@ -1,3 +1,6 @@
+* Thu Sep 18 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140911.180109-1-ge1344e6
+- Updating packaging to remove hard coded paths
+
 * Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215754-1-g59c6738
 - Removing space in app name - Fix for TC-1404
 

diff --git a/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/packaging/modello-appmanager.spec b/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/packaging/modello-appmanager.spec
index 1b7e0d0..763d58e 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/packaging/modello-appmanager.spec
+++ b/samples/web/Sample/Tizen/Web App/ModelloAppManager/project/packaging/modello-appmanager.spec
@@ -8,6 +8,7 @@ URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  zip
 Requires:   Modello_Common
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 A proof of concept pure html5 UI
@@ -15,15 +16,14 @@ A proof of concept pure html5 UI
 %prep
 %setup -q -n %{name}-%{version}
 
-%build
-
-make wgtPkg
-
 %install
 rm -rf %{buildroot}
-%make_install
+mkdir -p %{buildroot}%{TZ_SYS_APP_PREINSTALL}
+mkdir -p %{buildroot}%{_datadir}/Modello/Common/icons
+zip -r %{buildroot}%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt config.xml css AppManager_icon.png index.html js templates
+install -m 0644 AppManager_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
 
 %files
 %defattr(-,root,root,-)
-/opt/usr/apps/.preinstallWidgets/Modello_Appmanager.wgt
-/opt/usr/apps/_common/icons/AppManager_icon.png
+%{TZ_SYS_APP_PREINSTALL}/Modello_Appmanager.wgt
+%{_datadir}/Modello/Common/icons/AppManager_icon.png

diff --git a/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/Makefile b/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/Makefile
deleted file mode 100644 (file)
index db20233..0000000
--- a/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PROJECT = Modello_Dashboard
-
-VERSION := 0.0.2
-PACKAGE = $(PROJECT)-$(VERSION)
-
-INSTALL_FILES = $(PROJECT).wgt
-INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets
-
-wgtPkg:
-       zip -r $(PROJECT).wgt components config.xml css Dashboard_icon.png index.html js
-
-install:
-       @echo "Installing Dashboard, stand by..."
-       mkdir -p $(INSTALL_DIR)/
-       mkdir -p ${DESTDIR}/opt/usr/apps/_common/icons
-       cp $(PROJECT).wgt $(INSTALL_DIR)/
-       cp Dashboard_icon.png ${DESTDIR}/opt/usr/apps/_common/icons
-
-dist:
-       tar czf ../$(PACKAGE).tar.bz2 .

diff --git a/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/packaging/modello-dashboard.changes b/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/packaging/modello-dashboard.changes
index ff2a18a..2baed6f 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/packaging/modello-dashboard.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/packaging/modello-dashboard.changes
@@ -1,3 +1,6 @@
+* Thu Sep 18 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140911.180109-1-g942f657
+- Updating packaging to remove hard coded paths
+
 * Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215800-1-g73c1cf7
 - Removing space in app name - Fix for TC-1404
 

diff --git a/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/packaging/modello-dashboard.spec b/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/packaging/modello-dashboard.spec
index d463dbf..564ea94 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/packaging/modello-dashboard.spec
+++ b/samples/web/Sample/Tizen/Web App/ModelloDashboard/project/packaging/modello-dashboard.spec
@@ -8,6 +8,7 @@ URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  zip
 Requires:   Modello_Common
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 A proof of concept pure html5 UI
@@ -15,15 +16,14 @@ A proof of concept pure html5 UI
 %prep
 %setup -q -n %{name}-%{version}
 
-%build
-
-make wgtPkg
-
 %install
 rm -rf %{buildroot}
-%make_install
+mkdir -p %{buildroot}%{TZ_SYS_APP_PREINSTALL}
+mkdir -p %{buildroot}%{_datadir}/Modello/Common/icons
+zip -r %{buildroot}%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt components config.xml css Dashboard_icon.png index.html js
+install -m 0644 Dashboard_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
 
 %files
 %defattr(-,root,root,-)
-/opt/usr/apps/.preinstallWidgets/Modello_Dashboard.wgt
-/opt/usr/apps/_common/icons/Dashboard_icon.png
+%{TZ_SYS_APP_PREINSTALL}/Modello_Dashboard.wgt
+%{_datadir}/Modello/Common/icons/Dashboard_icon.png

diff --git a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/Makefile b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/Makefile
deleted file mode 100644 (file)
index 4e5e48c..0000000
--- a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PROJECT = Modello_Hvac
-
-VERSION := 0.0.2
-PACKAGE = $(PROJECT)-$(VERSION)
-
-INSTALL_FILES = $(PROJECT).wgt
-INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets
-
-wgtPkg:
-       zip -r $(PROJECT).wgt config.xml css HVAC_icon.png index.html js
-
-install:
-       @echo "Installing HVAC, stand by..."
-       mkdir -p $(INSTALL_DIR)/
-       mkdir -p ${DESTDIR}/opt/usr/apps/_common/icons
-       cp $(PROJECT).wgt $(INSTALL_DIR)/
-       cp HVAC_icon.png ${DESTDIR}/opt/usr/apps/_common/icons
-
-dist:
-       tar czf ../$(PACKAGE).tar.bz2 .

diff --git a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.changes b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.changes
index 318d302..d67a2fd 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.changes
@@ -1,3 +1,6 @@
+* Thu Sep 18 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140911.180109-1-g3a271c4
+- Updating packaging to remove hard coded paths
+
 * Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215818-1-geac9226
 - Removing space in app name - Fix for TC-1404
 

diff --git a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.spec b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.spec
index 7b6df49..bb12d5e 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.spec
+++ b/samples/web/Sample/Tizen/Web App/ModelloHVAC/project/packaging/modello-hvac.spec
@@ -8,6 +8,7 @@ URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  zip
 Requires:   Modello_Common
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 A proof of concept pure html5 UI
@@ -15,15 +16,14 @@ A proof of concept pure html5 UI
 %prep
 %setup -q -n %{name}-%{version}
 
-%build
-
-make wgtPkg
-
 %install
 rm -rf %{buildroot}
-%make_install
+mkdir -p %{buildroot}%{TZ_SYS_APP_PREINSTALL}
+mkdir -p %{buildroot}%{_datadir}/Modello/Common/icons
+zip -r %{buildroot}%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt config.xml css HVAC_icon.png index.html js
+install -m 0644 HVAC_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
 
 %files
 %defattr(-,root,root,-)
-/opt/usr/apps/.preinstallWidgets/Modello_Hvac.wgt
-/opt/usr/apps/_common/icons/HVAC_icon.png
+%{TZ_SYS_APP_PREINSTALL}/Modello_Hvac.wgt
+%{_datadir}/Modello/Common/icons/HVAC_icon.png

diff --git a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/Makefile b/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/Makefile
deleted file mode 100644 (file)
index 50a3c7e..0000000
--- a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PROJECT = Modello_Homescreen
-
-VERSION := 0.0.2
-PACKAGE = $(PROJECT)-$(VERSION)
-
-INSTALL_FILES = $(PROJECT).wgt
-INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets
-
-wgtPkg:
-       zip -r $(PROJECT).wgt config.xml manifest.json css Homescreen_icon.png index.html js
-
-install:
-       @echo "Installing Homescreen, stand by..."
-       mkdir -p $(INSTALL_DIR)/
-       mkdir -p ${DESTDIR}/opt/usr/apps/_common/icons
-       cp $(PROJECT).wgt $(INSTALL_DIR)/
-       cp Homescreen_icon.png ${DESTDIR}/opt/usr/apps/_common/icons
-
-dist:
-       tar czf ../$(PACKAGE).tar.bz2 .

diff --git a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/packaging/modello-homescreen.changes b/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/packaging/modello-homescreen.changes
index 65d54dc..111be24 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/packaging/modello-homescreen.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/packaging/modello-homescreen.changes
@@ -1,3 +1,6 @@
+* Thu Sep 18 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140911.180109-1-gf72b405
+- Updating packaging to remove hard coded paths
+
 * Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> accepted/tizen/ivi/20140828.212836-1-g6742024
 - Removing space in app name - Fix for TC-1404
 

diff --git a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/packaging/modello-homescreen.spec b/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/packaging/modello-homescreen.spec
index 48bb82d..b3155eb 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/packaging/modello-homescreen.spec
+++ b/samples/web/Sample/Tizen/Web App/ModelloHomescreen/project/packaging/modello-homescreen.spec
@@ -8,6 +8,7 @@ URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  zip
 Requires:   Modello_Common
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 A proof of concept pure html5 UI
@@ -15,12 +16,12 @@ A proof of concept pure html5 UI
 %prep
 %setup -q -n %{name}-%{version}
 
-%build
-
-make wgtPkg
-
 %install
-    %make_install
+    mkdir -p %{buildroot}%{TZ_SYS_APP_PREINSTALL}
+    mkdir -p %{buildroot}%{_datadir}/Modello/Common/icons
+    zip -r %{buildroot}%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt config.xml manifest.json css Homescreen_icon.png index.html js
+    install -m 0644 Homescreen_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
+
     mkdir -p %{buildroot}%{_bindir}
     mkdir -p %{buildroot}%{_libdir}/systemd/user/weston.target.wants/
     install -m 755 systemd/modello_launcher.sh %{buildroot}%{_bindir}
@@ -30,8 +31,8 @@ make wgtPkg
 
 %files
 %defattr(-,root,root,-)
-/opt/usr/apps/.preinstallWidgets/Modello_Homescreen.wgt
-/opt/usr/apps/_common/icons/Homescreen_icon.png
+%{TZ_SYS_APP_PREINSTALL}/Modello_Homescreen.wgt
+%{_datadir}/Modello/Common/icons/Homescreen_icon.png
 %{_libdir}/systemd/user/Modello_Homescreen.service
 %{_libdir}/systemd/user/Modello_Homescreen-launchpad-ready.path
 %{_bindir}/modello_launcher.sh

diff --git a/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/Makefile b/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/Makefile
deleted file mode 100644 (file)
index d6b559b..0000000
--- a/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PROJECT = Modello_Multimediaplayer
-
-VERSION := 0.0.2
-PACKAGE = $(PROJECT)-$(VERSION)
-
-INSTALL_FILES = $(PROJECT).wgt
-INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets
-
-wgtPkg:
-       zip -r $(PROJECT).wgt components config.xml css MultimediaPlayer_icon.png images index.html js
-
-install:
-       @echo "Installing Multimediaplayer, stand by..."
-       mkdir -p $(INSTALL_DIR)/
-       mkdir -p ${DESTDIR}/opt/usr/apps/_common/icons
-       cp $(PROJECT).wgt $(INSTALL_DIR)/
-       cp MultimediaPlayer_icon.png ${DESTDIR}/opt/usr/apps/_common/icons
-
-dist:
-       tar czf ../$(PACKAGE).tar.bz2 .

diff --git a/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/Multimedia_Player_icon.png b/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/Multimedia_Player_icon.png
deleted file mode 100644 (file)
index 4716719..0000000
Binary files a/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/Multimedia_Player_icon.png and /dev/null differ

diff --git a/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/packaging/modello-multimediaplayer.changes b/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/packaging/modello-multimediaplayer.changes
index 3194251..1a6f866 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/packaging/modello-multimediaplayer.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/packaging/modello-multimediaplayer.changes
@@ -1,3 +1,6 @@
+* Thu Sep 18 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140911.180109-1-gbc26d5f
+- Updating packaging to remove hard coded paths
+
 * Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215824-1-g0d52355
 
 * Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215824-1-g0d52355

diff --git a/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/packaging/modello-multimediaplayer.spec b/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/packaging/modello-multimediaplayer.spec
index 54713c0..36b4eba 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/packaging/modello-multimediaplayer.spec
+++ b/samples/web/Sample/Tizen/Web App/ModelloMultimediaPlayer/project/packaging/modello-multimediaplayer.spec
@@ -8,6 +8,7 @@ URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  zip
 Requires:   Modello_Common
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 A proof of concept pure html5 UI
@@ -15,15 +16,14 @@ A proof of concept pure html5 UI
 %prep
 %setup -q -n %{name}-%{version}
 
-%build
-
-make wgtPkg
-
 %install
 rm -rf %{buildroot}
-%make_install
+mkdir -p %{buildroot}%{TZ_SYS_APP_PREINSTALL}
+mkdir -p %{buildroot}%{_datadir}/Modello/Common/icons
+zip -r %{buildroot}%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt components config.xml css MultimediaPlayer_icon.png images index.html js
+install -m 0644 MultimediaPlayer_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
 
 %files
 %defattr(-,root,root,-)
-/opt/usr/apps/.preinstallWidgets/Modello_Multimediaplayer.wgt
-/opt/usr/apps/_common/icons/MultimediaPlayer_icon.png
+%{TZ_SYS_APP_PREINSTALL}/Modello_Multimediaplayer.wgt
+%{_datadir}/Modello/Common/icons/MultimediaPlayer_icon.png

diff --git a/samples/web/Sample/Tizen/Web App/ModelloNavigation/project/Makefile b/samples/web/Sample/Tizen/Web App/ModelloNavigation/project/Makefile
deleted file mode 100644 (file)
index 91c7cc4..0000000
--- a/samples/web/Sample/Tizen/Web App/ModelloNavigation/project/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PROJECT = Modello_Nav
-
-VERSION := 0.0.2
-PACKAGE = $(PROJECT)-$(VERSION)
-
-INSTALL_FILES = $(PROJECT).wgt
-INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets
-
-wgtPkg:
-       zip -r $(PROJECT).wgt config.xml css Navigation_icon.png images index.html js templates
-
-install:
-       @echo "Installing Navigation, stand by..."
-       mkdir -p $(INSTALL_DIR)/
-       mkdir -p ${DESTDIR}/opt/usr/apps/_common/icons
-       cp $(PROJECT).wgt $(INSTALL_DIR)/
-       cp Navigation_icon.png ${DESTDIR}/opt/usr/apps/_common/icons
-
-dist:
-       tar czf ../$(PACKAGE).tar.bz2 .

diff --git a/samples/web/Sample/Tizen/Web App/ModelloNavigation/project/packaging/modello-nav.spec b/samples/web/Sample/Tizen/Web App/ModelloNavigation/project/packaging/modello-nav.spec
index d6c1529..059a9d9 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloNavigation/project/packaging/modello-nav.spec
+++ b/samples/web/Sample/Tizen/Web App/ModelloNavigation/project/packaging/modello-nav.spec
@@ -8,6 +8,7 @@ URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  zip
 Requires:   Modello_Common
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 A proof of concept pure html5 UI
@@ -15,15 +16,14 @@ A proof of concept pure html5 UI
 %prep
 %setup -q -n %{name}-%{version}
 
-%build
-
-make wgtPkg
-
 %install
 rm -rf %{buildroot}
-%make_install
+mkdir -p %{buildroot}%{TZ_SYS_APP_PREINSTALL}
+mkdir -p %{buildroot}%{_datadir}/Modello/Common/icons
+zip -r %{buildroot}%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt config.xml css Navigation_icon.png images index.html js templates
+install -m 0644 Navigation_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
 
 %files
 %defattr(-,root,root,-)
-/opt/usr/apps/.preinstallWidgets/Modello_Nav.wgt
-/opt/usr/apps/_common/icons/Navigation_icon.png
+%{TZ_SYS_APP_PREINSTALL}/Modello_Nav.wgt
+%{_datadir}/Modello/Common/icons/Navigation_icon.png

diff --git a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/Makefile b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/Makefile
deleted file mode 100644 (file)
index f82f8ea..0000000
--- a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PROJECT = Modello_Phone
-
-VERSION := 0.0.2
-PACKAGE = $(PROJECT)-$(VERSION)
-
-INSTALL_FILES = $(PROJECT).wgt
-INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets
-
-wgtPkg:
-       zip -r $(PROJECT).wgt config.xml css data Phone_icon.png index.html js templates
-
-install:
-       @echo "Installing Phone, stand by..."
-       mkdir -p $(INSTALL_DIR)/
-       mkdir -p ${DESTDIR}/opt/usr/apps/_common/icons
-       cp $(PROJECT).wgt $(INSTALL_DIR)/
-       cp Phone_icon.png ${DESTDIR}/opt/usr/apps/_common/icons
-
-dist:
-       tar czf ../$(PACKAGE).tar.bz2 .

diff --git a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.changes b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.changes
index 9d7464a..98bc5ae 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.changes
@@ -1,3 +1,6 @@
+* Thu Sep 18 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140911.180109-1-g5ec1a4a
+- Updating packaging to remove hard coded paths
+
 * Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215838-1-g740adb1
 - Removing space in app name - Fix for TC-1404
 

diff --git a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.spec b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.spec
index 9c82f5d..209e989 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.spec
+++ b/samples/web/Sample/Tizen/Web App/ModelloPhone/project/packaging/modello-phone.spec
@@ -9,6 +9,7 @@ Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  zip
 Requires:   Modello_Common
 Requires:   phoned
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 A proof of concept pure html5 UI
@@ -16,15 +17,14 @@ A proof of concept pure html5 UI
 %prep
 %setup -q -n %{name}-%{version}
 
-%build
-
-make wgtPkg
-
 %install
 rm -rf %{buildroot}
-%make_install
+mkdir -p %{buildroot}%{TZ_SYS_APP_PREINSTALL}
+mkdir -p %{buildroot}%{_datadir}/Modello/Common/icons
+zip -r %{buildroot}%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt config.xml css data Phone_icon.png index.html js templates
+install -m 0644 Phone_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
 
 %files
 %defattr(-,root,root,-)
-/opt/usr/apps/.preinstallWidgets/Modello_Phone.wgt
-/opt/usr/apps/_common/icons/Phone_icon.png
+%{TZ_SYS_APP_PREINSTALL}/Modello_Phone.wgt
+%{_datadir}/Modello/Common/icons/Phone_icon.png

diff --git a/samples/web/Sample/Tizen/Web App/ModelloSmartDeviceLink/project/Makefile b/samples/web/Sample/Tizen/Web App/ModelloSmartDeviceLink/project/Makefile
deleted file mode 100644 (file)
index f91278f..0000000
--- a/samples/web/Sample/Tizen/Web App/ModelloSmartDeviceLink/project/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PROJECT = Modello_SDL
-
-VERSION := 0.0.2
-PACKAGE = $(PROJECT)-$(VERSION)
-
-INSTALL_FILES = $(PROJECT).wgt
-INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets
-
-wgtPkg:
-       zip -r $(PROJECT).wgt app audio config.xml css ffw SmartDeviceLink_icon.png images index.html js lib locale
-
-install:
-       @echo "Installing Smart Device Link, stand by..."
-       mkdir -p $(INSTALL_DIR)/
-       mkdir -p ${DESTDIR}/opt/usr/apps/_common/icons
-       cp $(PROJECT).wgt $(INSTALL_DIR)/
-       cp SmartDeviceLink_icon.png ${DESTDIR}/opt/usr/apps/_common/icons
-
-dist:
-       tar czf ../$(PACKAGE).tar.bz2 .

diff --git a/samples/web/Sample/Tizen/Web App/ModelloSmartDeviceLink/project/packaging/modello-sdl.changes b/samples/web/Sample/Tizen/Web App/ModelloSmartDeviceLink/project/packaging/modello-sdl.changes
index 28e9afc..c76dcbb 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloSmartDeviceLink/project/packaging/modello-sdl.changes
+++ b/samples/web/Sample/Tizen/Web App/ModelloSmartDeviceLink/project/packaging/modello-sdl.changes
@@ -1,3 +1,6 @@
+* Thu Sep 18 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140911.180109-1-g9570878
+- Updating packaging to remove hard coded paths
+
 * Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215851-1-g5f6b3fa
 - Removing space in app name - Fix for TC-1404
 

diff --git a/samples/web/Sample/Tizen/Web App/ModelloSmartDeviceLink/project/packaging/modello-sdl.spec b/samples/web/Sample/Tizen/Web App/ModelloSmartDeviceLink/project/packaging/modello-sdl.spec
index a4b3a56..11084e1 100644 (file)
--- a/samples/web/Sample/Tizen/Web App/ModelloSmartDeviceLink/project/packaging/modello-sdl.spec
+++ b/samples/web/Sample/Tizen/Web App/ModelloSmartDeviceLink/project/packaging/modello-sdl.spec
@@ -8,6 +8,7 @@ URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  zip
 Requires:   Modello_Common
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 A proof of concept pure html5 UI
@@ -15,15 +16,14 @@ A proof of concept pure html5 UI
 %prep
 %setup -q -n %{name}-%{version}
 
-%build
-
-make wgtPkg
-
 %install
 rm -rf %{buildroot}
-%make_install
+mkdir -p %{buildroot}%{TZ_SYS_APP_PREINSTALL}
+mkdir -p %{buildroot}%{_datadir}/Modello/Common/icons
+zip -r %{buildroot}%{TZ_SYS_APP_PREINSTALL}/%{name}.wgt app audio config.xml css ffw SmartDeviceLink_icon.png images index.html js lib locale
+install -m 0644 SmartDeviceLink_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
 
 %files
 %defattr(-,root,root,-)
-/opt/usr/apps/.preinstallWidgets/Modello_SDL.wgt
-/opt/usr/apps/_common/icons/SmartDeviceLink_icon.png
+%{TZ_SYS_APP_PREINSTALL}/Modello_SDL.wgt
+%{_datadir}/Modello/Common/icons/SmartDeviceLink_icon.png