Updating packaging to remove hard coded paths

Change-Id: I65b21cc4e65959060719b54c29336d2c4f40a128

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index f82f8ea..0000000
--- a/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/packaging/modello-phone.changes b/packaging/modello-phone.changes
index 9d7464a..98bc5ae 100644 (file)
--- a/packaging/modello-phone.changes
+++ b/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/packaging/modello-phone.spec b/packaging/modello-phone.spec
index 9c82f5d..209e989 100644 (file)
--- a/packaging/modello-phone.spec
+++ b/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