Update desktop-skin recipe

Also add it to spec2yoctorc since it was missing which ended up
generatig erronous recipes.

Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/proto-meta-Tizen_generic/.spec2yoctorc b/proto-meta-Tizen_generic/.spec2yoctorc
index 2c8b8f4..4cb989a 100644 (file)
--- a/proto-meta-Tizen_generic/.spec2yoctorc
+++ b/proto-meta-Tizen_generic/.spec2yoctorc
@@ -27,7 +27,7 @@ default_git_src=review.tizen.org
 priority=1
 
 [whitelist_tizen_common]
-list=smack, rpm, uthash, lua, weston-common,  fdupes, doxygen, crosswalk, libslp-location, location-manager, vconf, appcore-agent, dlog, common, libslp-sysman, aul-1, librua, libhaptic, pkgmgr-info, libdevice-node, xdgmime, libprivilege-control, ail, bundle, app-checker, privacy-manager, libslp-pm, vconf-internal-keys, system-info, libiri, sound-manager, iniparser, libmm-sound, libmm-session, libmm-common, libmm-log, heynoti, security-server, audio-session-manager, avsystem, libmm-ta, slp-pkgmgr, app-core, libslp-sensor, libsf-common, tizen-platform-config, application, libslp-db-util, tizen-platform-wrapper, app-svc, notification, alarm-manager, com-core, libtapi, libtapi-legacy, alsa-scenario-0.2, systemd, hwdata, user-session-units, systemd, meta, pam
+list=smack, rpm, uthash, lua, weston-common,  fdupes, doxygen, crosswalk, libslp-location, location-manager, vconf, appcore-agent, dlog, common, libslp-sysman, aul-1, librua, libhaptic, pkgmgr-info, libdevice-node, xdgmime, libprivilege-control, ail, bundle, app-checker, privacy-manager, libslp-pm, vconf-internal-keys, system-info, libiri, sound-manager, iniparser, libmm-sound, libmm-session, libmm-common, libmm-log, heynoti, security-server, audio-session-manager, avsystem, libmm-ta, slp-pkgmgr, app-core, libslp-sensor, libsf-common, tizen-platform-config, application, libslp-db-util, tizen-platform-wrapper, app-svc, notification, alarm-manager, com-core, libtapi, libtapi-legacy, alsa-scenario-0.2, systemd, hwdata, user-session-units, systemd, meta, pam, desktop-skin
 
 [substitute]
 pkgconfig(zlib)=zlib-devel

diff --git a/proto-meta-Tizen_generic/specfile-initial/desktop-skin/packaging/desktop-skin.spec b/proto-meta-Tizen_generic/specfile-initial/desktop-skin/packaging/desktop-skin.spec
index 164bf2c..bfd7686 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/desktop-skin/packaging/desktop-skin.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/desktop-skin/packaging/desktop-skin.spec
@@ -1,19 +1,17 @@
-%define USERHOME       /home/app
-
 Name:          desktop-skin
-Summary:       Provides desktop-skin.
+Summary:       Desktop skin for Tizen:Common
 Version:       2.0
-Group:                 Applications
+Group:                 Applications/Multimedia
 License:    GPL-2.0+
 Release:       1
-
-
-
 Source0:        %{name}-%{version}.tar.gz
 
 %description
-Provides desktop-skin.
-
+Provides desktop visuals and test programs
+- desktop background
+- sample media
+- icons
+- test programs
 
 %prep
 %setup -q
@@ -24,30 +22,31 @@ Provides desktop-skin.
 mkdir -p %{buildroot}%{_bindir}
 install -m 755 Script/launch_cam.sh %{buildroot}%{_bindir}
 install -m 755 Script/launch_video.sh %{buildroot}%{_bindir}
+install -m 755 Script/wifi %{buildroot}%{_bindir}
 
-mkdir -p %{buildroot}%{USERHOME}
-install -m 644 Video/AmazingNature_480p.mp4 %{buildroot}%{USERHOME}
+mkdir -p %{buildroot}%{_datadir}/media/videos
+install -m 644 Video/AmazingNature_480p.mp4 %{buildroot}%{_datadir}/media/videos
 
-mkdir -p %{buildroot}%{USERHOME}/Photos
-install -m 644 Photos/* %{buildroot}%{USERHOME}/Photos
+mkdir -p %{buildroot}%{_datadir}/media/photos
+install -m 644 Photos/* %{buildroot}%{_datadir}/media/photos
 
 mkdir -p %{buildroot}%{_datadir}/icons/tizen/32x32
 install -m 644 icons/tizen/32x32/* %{buildroot}%{_datadir}/icons/tizen/32x32
 
+mkdir -p %{buildroot}%{_datadir}/applications/tizen
+install -m 644 applications/tizen/* %{buildroot}%{_datadir}/applications/tizen
+
 mkdir -p %{buildroot}%{_datadir}/backgrounds/tizen
 install -m 644  backgrounds/tizen/golfe-morbihan.jpg %{buildroot}%{_datadir}/backgrounds/tizen/golfe-morbihan.jpg
+install -m 644  backgrounds/tizen/tizen_common.png %{buildroot}%{_datadir}/backgrounds/tizen/tizen_common.png
 
 %post
-chown -R app:app %{USERHOME}
+ln -s tizen_common.png %{_datadir}/backgrounds/tizen/current
 
 %files
-%{_bindir}/launch_cam.sh
-%{_bindir}/launch_video.sh
-
-%{USERHOME}/AmazingNature_480p.mp4
-
-%{USERHOME}/Photos/*
-
+%{_bindir}/*
+%{_datadir}/media/videos/AmazingNature_480p.mp4
+%{_datadir}/media/photos/*
 %{_datadir}/icons/tizen/32x32/*
-
-%{_datadir}/backgrounds/tizen/golfe-morbihan.jpg
+%{_datadir}/applications/tizen/*
+%{_datadir}/backgrounds/tizen/*