From: Brian Jones <brian.j.jones@intel.com>
Date: Fri, 19 Sep 2014 01:44:31 +0000 (-0700)
Subject: Updating packaging to remove hard coded paths
X-Git-Tag: accepted/tizen/ivi/20140926.101729
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Faccepted%2Ftizen%2Fivi%2F20140926.101729;p=profile%2Fivi%2FModello_Nav.git

Updating packaging to remove hard coded paths

Change-Id: Id3aa5bb1ef653acea24d02bed7a30388a8b74ab4
---

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 91c7cc4..0000000
--- a/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/packaging/modello-nav.spec b/packaging/modello-nav.spec
index d6c1529..059a9d9 100644
--- a/packaging/modello-nav.spec
+++ b/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