Updating packaging to remove hard coded paths

Change-Id: Ibf21a1bc841cee3cebcde7f9c3308db32c6debf0

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index 50a3c7e..0000000
--- a/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/packaging/modello-homescreen.changes b/packaging/modello-homescreen.changes
index 65d54dc..111be24 100644 (file)
--- a/packaging/modello-homescreen.changes
+++ b/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/packaging/modello-homescreen.spec b/packaging/modello-homescreen.spec
index 8e4f9a0..927d542 100644 (file)
--- a/packaging/modello-homescreen.spec
+++ b/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