Updating packaging to remove hard coded paths

Change-Id: I79c99cc562bdd4a96d022ba253c7aebe16f39625

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index db20233..0000000
--- a/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/packaging/modello-dashboard.changes b/packaging/modello-dashboard.changes
index ff2a18a..2baed6f 100644 (file)
--- a/packaging/modello-dashboard.changes
+++ b/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/packaging/modello-dashboard.spec b/packaging/modello-dashboard.spec
index d463dbf..564ea94 100644 (file)
--- a/packaging/modello-dashboard.spec
+++ b/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