Updating packaging to remove hard coded paths

Change-Id: Ib658eff19c8053fdfdd897dd6ff1683194a7644a

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index 616da5a..0000000
--- a/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/packaging/modello-appmanager.changes b/packaging/modello-appmanager.changes
index 86ac586..1b4c305 100644 (file)
--- a/packaging/modello-appmanager.changes
+++ b/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/packaging/modello-appmanager.spec b/packaging/modello-appmanager.spec
index 1b7e0d0..763d58e 100644 (file)
--- a/packaging/modello-appmanager.spec
+++ b/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