update gen pkg

Change-Id: Ie1f0ff7200168c3b930ad05129e2d42c88bcb726
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/proto-meta-Tizen_generic/.spec2yoctorc b/proto-meta-Tizen_generic/.spec2yoctorc
index a932af3..06dc913 100644 (file)
--- a/proto-meta-Tizen_generic/.spec2yoctorc
+++ b/proto-meta-Tizen_generic/.spec2yoctorc
@@ -34,7 +34,7 @@ default_git_src=review.tizen.org
 priority=2
 
 [whitelist_tizen_common]
-list=smack, rpm, uthash, lua, weston-common,  fdupes, crosswalk, libslp-location, location-manager, vconf, appcore-agent, dlog, common, system-server, aul-1, librua,  pkgmgr-info, libdevice-node, xdgmime, libprivilege-control, ail, bundle, app-checker, privacy-manager, 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, meta, pam, desktop-skin, default-ac-domains, sensor, tizen-extensions-crosswalk, app-manager, package-manager, bluetooth, connection, device, power, runtime-info, system-settings, favorites, url-download, media-content, bluetooth-frwk, libmedia-service, libmedia-thumbnail, download-provider, media-server, libmm-utility, libmm-fileinfo, libwifi-direct, libdevice-node, tethering, syspopup, status,libnet-client, libdevice-node, drm-client, efl, elementary, ibus, libtbm, libbullet, dbus-python, gobject-introspection, edbus, bluetooth-tools, Modello_AMBSimulator, Modello_Appmanager, Modello_Common, Modello_Dashboard, Modello_Homescreen, Modello_Hvac, Modello_Installer, Modello_Multimediaplayer, Modello_Nav, Modello_Phone, Modello_SDL, automotive-message-broker, efl-theme-tizen, festival, genivi-audio-manager, ico-uxf-device-input-controller, ico-uxf-homescreen, ico-uxf-homescreen-sample-apps, ico-uxf-utilities, ico-uxf-weston-plugin, ico-vic-amb-plugin, ico-vic-carsimulator, lemolo, libwebsockets, message-port-dbus, murphy, node-startup-controller, phoned, pulseaudio-module-murphy-ivi, rygel, sphinxbase, udev-rules, wayland-ivi-extension, weston-ivi, weston-ivi-shell, dlt-daemon, contacts-service, evolution-data-server, badge, libaccounts-svc, gcr, libsecret, image-util, python-setuptools, pims-ipc, update-desktop-files, gpg2 , adns,libgsignon-glib,nfc, nfc-manager-neard , neardal,  libsvi , wifi, wav-player, weekeyboard, ibus-hangul, libhangul, ibus-libpinyin, libpinyin, desktop-file-utils, gsignond, ecryptfs-utils, keyutils, wrt-widgets, meta-generic, net-config, weston, gsignond-plugin-oauth, gsignond-plugin-sasl, libgsasl
+list=smack, rpm, uthash, lua, weston-common,  fdupes, crosswalk, libslp-location, location-manager, vconf, appcore-agent, dlog, common, system-server, aul-1, librua,  pkgmgr-info, libdevice-node, xdgmime, libprivilege-control, ail, bundle, app-checker, privacy-manager, 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, meta, pam, desktop-skin, default-ac-domains, sensor, tizen-extensions-crosswalk, app-manager, package-manager, bluetooth, connection, device, power, runtime-info, system-settings, favorites, url-download, media-content, bluetooth-frwk, libmedia-service, libmedia-thumbnail, download-provider, media-server, libmm-utility, libmm-fileinfo, libwifi-direct, libdevice-node, tethering, syspopup, status,libnet-client, libdevice-node, drm-client, efl, elementary, ibus, libtbm, libbullet, dbus-python, gobject-introspection, edbus, bluetooth-tools, Modello_AMBSimulator, Modello_Appmanager, Modello_Common, Modello_Dashboard, Modello_Homescreen, Modello_Hvac, Modello_Installer, Modello_Multimediaplayer, Modello_Nav, Modello_Phone, Modello_SDL, automotive-message-broker, efl-theme-tizen, festival, genivi-audio-manager, ico-uxf-device-input-controller, ico-uxf-homescreen, ico-uxf-homescreen-sample-apps, ico-uxf-utilities, ico-uxf-weston-plugin, ico-vic-amb-plugin, ico-vic-carsimulator, lemolo, libwebsockets, message-port-dbus, murphy, node-startup-controller, phoned, pulseaudio-module-murphy-ivi, rygel, sphinxbase, udev-rules, wayland-ivi-extension, weston-ivi, weston-ivi-shell, dlt-daemon, contacts-service, evolution-data-server, badge, libaccounts-svc, gcr, libsecret, image-util, python-setuptools, pims-ipc, update-desktop-files, gpg2 , adns,libgsignon-glib,nfc, nfc-manager-neard , neardal,  libsvi , wifi, wav-player, weekeyboard, ibus-hangul, libhangul, ibus-libpinyin, libpinyin, desktop-file-utils, gsignond, ecryptfs-utils, keyutils, wrt-widgets, meta-generic, net-config, weston, gsignond-plugin-oauth, gsignond-plugin-sasl, libgsasl,common-api-dbus-runtime, common-api-runtime
 
 [substitute]
 pkgconfig(zlib)=zlib-devel
@@ -312,3 +312,5 @@ gssdp=pkgconfig(gssdp-1.0)
 usbutils=pkgconfig(usbutils)
 gsignond=pkgconfig(gsignond)
 libgsasl=pkgconfig(libgsasl)
+common-api-dbus-runtime=pkgconfig(CommonAPI-DBus)
+common-api-runtime=pkgconfig(CommonAPI)
\ No newline at end of file

diff --git a/proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.systemd b/proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.systemd
index 4370725..b9a538e 100644 (file)
--- a/proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.systemd
+++ b/proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.systemd
@@ -19,12 +19,12 @@
 
 # RPM macros for packages installing systemd unit files
 
-%_unitdir /lib/systemd/system
-%_unitdir_user /lib/systemd/user
-%_presetdir /usr/lib/systemd/system-preset
+%_unitdir ${systemd_unitdir}/system
+%_unitdir_user ${systemd_unitdir}/user
+%_presetdir ${systemd_unitdir}/system-preset
 %_udevhwdbdir /usr/lib/udev/hwdb.d
 %_udevrulesdir /usr/lib/udev/rules.d
-%_journalcatalogdir /usr/lib/systemd/catalog
+%_journalcatalogdir ${systemd_unitdir}/catalog
 %_tmpfilesdir /usr/lib/tmpfiles.d
 %_sysctldir /usr/lib/sysctl.d