summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Jones <brian.j.jones@intel.com>2014-09-18 18:45:16 -0700
committerBrian Jones <brian.j.jones@intel.com>2014-09-18 18:45:30 -0700
commit8c233b3ab7d8d27fa20777594ba05b6ff433ebcd (patch)
treeb002119522b17effbb991b7fedd8a31afce4ff11
parentda5a08677c5d448b3b16919d7ddc55c3175fe973 (diff)
downloadModello_SDL-8c233b3ab7d8d27fa20777594ba05b6ff433ebcd.tar.gz
Modello_SDL-8c233b3ab7d8d27fa20777594ba05b6ff433ebcd.tar.bz2
Modello_SDL-8c233b3ab7d8d27fa20777594ba05b6ff433ebcd.zip
Change-Id: If774e25399b413674ff5b9b375d94c7b3f02fdf4
-rw-r--r--Makefile20
-rw-r--r--packaging/modello-sdl.changes3
-rw-r--r--packaging/modello-sdl.spec14
3 files changed, 10 insertions, 27 deletions
diff --git a/Makefile b/Makefile
deleted file mode 100644
index f91278f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PROJECT = Modello_SDL
-
-VERSION := 0.0.2
-PACKAGE = $(PROJECT)-$(VERSION)
-
-INSTALL_FILES = $(PROJECT).wgt
-INSTALL_DIR = ${DESTDIR}/opt/usr/apps/.preinstallWidgets
-
-wgtPkg:
- zip -r $(PROJECT).wgt app audio config.xml css ffw SmartDeviceLink_icon.png images index.html js lib locale
-
-install:
- @echo "Installing Smart Device Link, stand by..."
- mkdir -p $(INSTALL_DIR)/
- mkdir -p ${DESTDIR}/opt/usr/apps/_common/icons
- cp $(PROJECT).wgt $(INSTALL_DIR)/
- cp SmartDeviceLink_icon.png ${DESTDIR}/opt/usr/apps/_common/icons
-
-dist:
- tar czf ../$(PACKAGE).tar.bz2 .
diff --git a/packaging/modello-sdl.changes b/packaging/modello-sdl.changes
index 28e9afc..c76dcbb 100644
--- a/packaging/modello-sdl.changes
+++ b/packaging/modello-sdl.changes
@@ -1,3 +1,6 @@
+* Thu Sep 18 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140911.180109-1-g9570878
+- Updating packaging to remove hard coded paths
+
* Wed Sep 10 2014 Brian Jones <brian.j.jones@intel.com> submit/tizen_ivi/20140819.215851-1-g5f6b3fa
- Removing space in app name - Fix for TC-1404
diff --git a/packaging/modello-sdl.spec b/packaging/modello-sdl.spec
index a4b3a56..11084e1 100644
--- a/packaging/modello-sdl.spec
+++ b/packaging/modello-sdl.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 app audio config.xml css ffw SmartDeviceLink_icon.png images index.html js lib locale
+install -m 0644 SmartDeviceLink_icon.png %{buildroot}%{_datadir}/Modello/Common/icons
%files
%defattr(-,root,root,-)
-/opt/usr/apps/.preinstallWidgets/Modello_SDL.wgt
-/opt/usr/apps/_common/icons/SmartDeviceLink_icon.png
+%{TZ_SYS_APP_PREINSTALL}/Modello_SDL.wgt
+%{_datadir}/Modello/Common/icons/SmartDeviceLink_icon.png