Update spec files

Also update spec2yoctorc:
* Remove chromium
* Replace message-port with message-port-dbus

Change-Id: I64a40677d1089a0e6a5940e3dba73102f32086e0
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 dd56678..0a0d101 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, 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, default-ac-domains, sensor, tizen-extensions-crosswalk, app-manager, package-manager, bluetooth, connection, device, power, runtime-info, system-settings, favorites, url-download, media-content, message-port, chromium, bluetooth-frwk, devman, 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, 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
+list=smack, rpm, uthash, lua, weston-common,  fdupes, 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, 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, devman, 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
 
 [substitute]
 pkgconfig(zlib)=zlib-devel
@@ -211,8 +211,6 @@ system-settings=pkgconfig(capi-system-system-settings)
 favorites=pkgconfig(capi-web-favorites)
 url-download=pkgconfig(capi-web-url-download)
 media-content=pkgconfig(capi-content-media-content)
-message-port=pkgconfig(message-port)
-chromium=pkgconfig(chromium)
 bluetooth-frwk=pkgconfig(bluetooth-api)
 devman=pkgconfig(devman)
 libmedia-service=pkgconfig(libmedia-service)
@@ -311,3 +309,5 @@ libhangul=pkgconfig(libhangul)
 libpinyin=libpinyin-devel
 ecryptfs-utils=pkgconfig(libecryptfs)
 keyutils=keyutils-devel
+python-pycairo=python-cairo
+message-port-dbus=message-port, pkgconfig(message-port)

diff --git a/proto-meta-Tizen_generic/specfile-initial/ail/packaging/ail.spec b/proto-meta-Tizen_generic/specfile-initial/ail/packaging/ail.spec
index 5da089d..6f1dd8f 100755 (executable)
--- a/proto-meta-Tizen_generic/specfile-initial/ail/packaging/ail.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/ail/packaging/ail.spec
@@ -10,6 +10,7 @@ BuildRequires:  cmake
 BuildRequires:  vconf-keys-devel
 BuildRequires:  pkgconfig(db-util)
 BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(xdgmime)
@@ -40,8 +41,9 @@ export CXXFLAGS="$CXXFLAGS ?DTIZEN_ENGINEER_MODE"
 export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE"
 %endif
 
-%cmake .  -DBUILD_PKGTYPE=rpm \
-          -DSMACK=Off
+%cmake .  -DTZ_SYS_RW_DESKTOP_APP=%TZ_SYS_RW_DESKTOP_APP \
+          -DBUILD_PKGTYPE=rpm \
+                 -DSMACK=Off
 
 %__make %{?_smp_mflags}
 

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 bfd7686..5bc3b71 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
@@ -6,6 +6,8 @@ License:    GPL-2.0+
 Release:       1
 Source0:        %{name}-%{version}.tar.gz
 
+Requires:       python-cairo
+
 %description
 Provides desktop visuals and test programs
 - desktop background
@@ -22,6 +24,7 @@ Provides desktop visuals and test programs
 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/mark_image.py %{buildroot}%{_bindir}
 install -m 755 Script/wifi %{buildroot}%{_bindir}
 
 mkdir -p %{buildroot}%{_datadir}/media/videos
@@ -41,7 +44,7 @@ install -m 644  backgrounds/tizen/golfe-morbihan.jpg %{buildroot}%{_datadir}/bac
 install -m 644  backgrounds/tizen/tizen_common.png %{buildroot}%{_datadir}/backgrounds/tizen/tizen_common.png
 
 %post
-ln -s tizen_common.png %{_datadir}/backgrounds/tizen/current
+ln -sf tizen_common.png %{_datadir}/backgrounds/tizen/current
 
 %files
 %{_bindir}/*

diff --git a/proto-meta-Tizen_generic/specfile-initial/ecryptfs-utils/packaging/ecryptfs-utils.spec b/proto-meta-Tizen_generic/specfile-initial/ecryptfs-utils/packaging/ecryptfs-utils.spec
index 1530669..3d68a5b 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/ecryptfs-utils/packaging/ecryptfs-utils.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/ecryptfs-utils/packaging/ecryptfs-utils.spec
@@ -81,11 +81,7 @@ rm -rf %{buildroot}
 %{_bindir}/ecryptfs*
 /sbin/mount.ecryptfs*
 /sbin/umount.ecryptfs*
-%ifarch x86_64
-/lib64/security/pam_ecryptfs.so
-%else
-/lib/security/pam_ecryptfs.so
-%endif
+/%{_lib}/security/pam_ecryptfs.so
 %{_datadir}/locale/*/LC_MESSAGES/ecryptfs-utils.mo
 %{_mandir}/man1/*ecryptfs*
 %{_mandir}/man7/*ecryptfs*

diff --git a/proto-meta-Tizen_generic/specfile-initial/efl/packaging/efl.spec b/proto-meta-Tizen_generic/specfile-initial/efl/packaging/efl.spec
index 34eeb3f..73828b9 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/efl/packaging/efl.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/efl/packaging/efl.spec
@@ -538,7 +538,15 @@ rm -rf %{buildroot}%{_libdir}/ecore/system/upower
 %post -n evas -p /sbin/ldconfig
 %postun -n evas -p /sbin/ldconfig
 
-%post -n ecore -p /sbin/ldconfig
+%post -n ecore
+/sbin/ldconfig
+
+%if %{with wayland}
+f="/etc/profile.d/ecore.sh"
+grep EFL_WAYLAND_USE_XDG_SHELL "$f" 2>/dev/null \
+    || printf "\nEFL_WAYLAND_USE_XDG_SHELL='defined'\nexport EFL_WAYLAND_USE_XDG_SHELL\n" >> "$f"
+%endif
+
 %postun -n ecore -p /sbin/ldconfig
 
 %post -n eldbus -p /sbin/ldconfig

diff --git a/proto-meta-Tizen_generic/specfile-initial/genivi-audio-manager/packaging/genivi-audio-manager.spec b/proto-meta-Tizen_generic/specfile-initial/genivi-audio-manager/packaging/genivi-audio-manager.spec
index b7dff75..442706b 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/genivi-audio-manager/packaging/genivi-audio-manager.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/genivi-audio-manager/packaging/genivi-audio-manager.spec
@@ -3,15 +3,15 @@ License:          MPL-2.0
 Group:            Automotive/API
 Summary:          GENIVI Audio Manager
 Version:          3.2
-Release:          1
+Release:          0
 Source:           %{name}-%{version}.tar.bz2
 BuildRequires:    cmake
-BuildRequires:   pkgconfig(libsystemd-journal)
-BuildRequires:   pkgconfig(python)
-BuildRequires:   pkgconfig(sqlite3)
-BuildRequires:   pkgconfig(dbus-1)
-BuildRequires:   pkgconfig(automotive-dlt)
-BuildRequires:   pkgconfig(zlib)
+BuildRequires:    pkgconfig(libsystemd-journal)
+BuildRequires:    pkgconfig(python)
+BuildRequires:    pkgconfig(sqlite3)
+BuildRequires:    pkgconfig(dbus-1)
+BuildRequires:    pkgconfig(automotive-dlt)
+BuildRequires:    pkgconfig(zlib)
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -30,17 +30,17 @@ Requires:   %{name} = %{version}-%{release}
 %setup -q -n %{name}-%{version}
 
 %build
-mkdir build
+mkdir -p build
 cd build
 
 cmake -DUSE_BUILD_LIBS=OFF -DWITH_TESTS=OFF -DWITH_DBUS_WRAPPER=ON -DWITH_NSM=OFF -DCMAKE_INSTALL_PREFIX=/usr ..
 #make VERBOSE=1
-make %{?_smp_mflags} 
+%__make %{?_smp_mflags}
 
 %install
 rm -rf "$RPM_BUILD_ROOT"
 cd build
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install DESTDIR=$RPM_BUILD_ROOT
 mkdir $RPM_BUILD_ROOT%{_includedir}/%{name}
 mv $RPM_BUILD_ROOT%{_includedir}/*.h $RPM_BUILD_ROOT%{_includedir}/command $RPM_BUILD_ROOT%{_includedir}/control $RPM_BUILD_ROOT%{_includedir}/routing $RPM_BUILD_ROOT%{_includedir}/shared $RPM_BUILD_ROOT%{_includedir}/%{name}
 rm $RPM_BUILD_ROOT%{_libdir}/audioManager/routing/libPluginRoutingInterfaceAsync.so*

diff --git a/proto-meta-Tizen_generic/specfile-initial/ibus-hangul/packaging/ibus-hangul.spec b/proto-meta-Tizen_generic/specfile-initial/ibus-hangul/packaging/ibus-hangul.spec
index 6cb9274..ec00862 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/ibus-hangul/packaging/ibus-hangul.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/ibus-hangul/packaging/ibus-hangul.spec
@@ -1,10 +1,10 @@
 %define mod_path ibus-1.4
 Name:       ibus-hangul
 Version:    1.4.2
-Release:    1
+Release:    0
 Summary:    The Hangul engine for IBus input platform
-License:    GPLv2+
-Group:      System Environment/Libraries
+License:    GPL-2.0+
+Group:      System/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1001: ibus-hangul.manifest
@@ -26,27 +26,27 @@ libhangul.
 %setup -q
 cp %{SOURCE1001} .
 
-
 %build
 %configure --disable-static
 # make -C po update-gmo
-make %{?_smp_mflags}
+%__make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} install
+rm -rf %{buildroot}
+%__make DESTDIR=%{buildroot} install
 
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/ibus-setup-hangul
-sed -i 's!^Exec=ibus-setup-hangul!Exec=%{_libexecdir}/ibus-setup-hangul!' ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-hangul.desktop
+rm -f %{buildroot}%{_bindir}/ibus-setup-hangul
+sed -i 's!^Exec=ibus-setup-hangul!Exec=%{_libexecdir}/ibus-setup-hangul!' %{buildroot}%{_datadir}/applications/ibus-setup-hangul.desktop
 
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %manifest %{name}.manifest
-%doc AUTHORS COPYING README
+%license COPYING
+%doc AUTHORS README
 %{_libexecdir}/ibus-engine-hangul
 %{_libexecdir}/ibus-setup-hangul
 %{_datadir}/ibus-hangul

diff --git a/proto-meta-Tizen_generic/specfile-initial/ibus-libpinyin/packaging/ibus-libpinyin.spec b/proto-meta-Tizen_generic/specfile-initial/ibus-libpinyin/packaging/ibus-libpinyin.spec
index d074117..4870e9b 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/ibus-libpinyin/packaging/ibus-libpinyin.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/ibus-libpinyin/packaging/ibus-libpinyin.spec
@@ -1,6 +1,6 @@
 Name:       ibus-libpinyin
 Version:    1.6.92
-Release:    1
+Release:    0
 Summary:    Intelligent Pinyin engine based on libpinyin for IBus
 License:    GPL-2.0+
 Group:      System/Libraries
@@ -19,7 +19,6 @@ BuildRequires:  ibus-devel >= 1.3
 BuildRequires:  libpinyin-devel > 0.6.90
 
 # Requires(post): sqlite
-
 Requires:   ibus >= 1.2.0
 Requires:   libpinyin > 0.6.90
 
@@ -30,27 +29,27 @@ It includes a Chinese Pinyin input method and a Chinese ZhuYin (Bopomofo) input
 %setup -q
 cp %{SOURCE1001} .
 
-
 %build
-%configure --disable-static \
-           --disable-boost
+%reconfigure --disable-static \
+             --disable-boost
 
 # make -C po update-gmo
-make %{?_smp_mflags}
+%__make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} install
+rm -rf %{buildroot}
+%__make DESTDIR=%{buildroot} install
 
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%license COPYING
+%doc AUTHORS README
 %{_datadir}/applications/*.desktop
 %{_libexecdir}/ibus-engine-libpinyin
 %{_libexecdir}/ibus-setup-libpinyin

diff --git a/proto-meta-Tizen_generic/specfile-initial/ico-uxf-homescreen/packaging/ico-uxf-homescreen.spec b/proto-meta-Tizen_generic/specfile-initial/ico-uxf-homescreen/packaging/ico-uxf-homescreen.spec
index 72b2e7e..dd19e02 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/ico-uxf-homescreen/packaging/ico-uxf-homescreen.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/ico-uxf-homescreen/packaging/ico-uxf-homescreen.spec
@@ -2,9 +2,8 @@ Name:       ico-uxf-homescreen
 Summary:    Sample homescreen and system controller
 Version:    0.9.22
 Release:    0
-Group:         Graphics & UI Framework/Automotive UI
+Group:      Automotive/ICO Homescreen
 License:    Apache-2.0
-URL:        ""
 Source0:    %{name}-%{version}.tar.bz2
 
 BuildRequires: pkgconfig(wayland-client) >= 1.4
@@ -38,6 +37,7 @@ BuildRequires: weston-ivi-shell-devel
 BuildRequires: genivi-shell
 BuildRequires: genivi-shell-devel
 BuildRequires: ico-uxf-utilities-devel >= 0.9.07
+BuildRequires: libtzplatform-config-devel
 Requires: weston >= 1.4
 Requires: weston-ivi-shell
 Requires: genivi-shell
@@ -67,24 +67,21 @@ Development files for application that communicate homescreen.
 %setup -q -n %{name}-%{version}
 
 mkdir -p weston
-cp -av /usr/share/genivi-shell/protocol/*.xml weston/
+cp -av %{TZ_SYS_SHARE}/genivi-shell/protocol/*.xml weston/
 
 ls weston/*.xml | while read protocol ; do
 
-    /usr/bin/wayland-scanner client-header \
+    %{_bindir}/wayland-scanner client-header \
         < "${protocol}" > "${protocol/.xml/}-client-protocol.h"
 
-    /usr/bin/wayland-scanner code \
+    %{_bindir}/wayland-scanner code \
         < "${protocol}" > "${protocol/.xml/.c}"
 
 done
 
-ls weston/
-
-
 %build
 %autogen
-make %{?_smp_mflags}
+%__make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -116,27 +113,27 @@ cp tool/notification/ico_send_notification2 %{buildroot}%{_bindir}
 
 %postun
 /sbin/ldconfig
-rm -f /usr/share/applications/org.tizen.ico.homescreen.desktop
-rm -f /usr/share/applications/org.tizen.ico.statusbar.desktop
-rm -f /usr/share/applications/org.tizen.ico.onscreen.desktop
-rm -f /usr/share/applications/org.tizen.ico.system-controller.desktop
+rm -f %{TZ_SYS_RW_DESKTOP_APP}/org.tizen.ico.homescreen.desktop
+rm -f %{TZ_SYS_RW_DESKTOP_APP}/org.tizen.ico.statusbar.desktop
+rm -f %{TZ_SYS_RW_DESKTOP_APP}/org.tizen.ico.onscreen.desktop
+rm -f %{TZ_SYS_RW_DESKTOP_APP}/org.tizen.ico.system-controller.desktop
 
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/usr/apps/org.tizen.ico.homescreen
-/usr/apps/org.tizen.ico.statusbar
-/usr/apps/org.tizen.ico.onscreen
-/usr/share/packages/org.tizen.ico.homescreen.xml
-/usr/share/packages/org.tizen.ico.statusbar.xml
-/usr/share/packages/org.tizen.ico.onscreen.xml
+%{TZ_SYS_RW_APP}/org.tizen.ico.homescreen
+%{TZ_SYS_RW_APP}/org.tizen.ico.statusbar
+%{TZ_SYS_RW_APP}/org.tizen.ico.onscreen
+%{TZ_SYS_RW_PACKAGES}/org.tizen.ico.homescreen.xml
+%{TZ_SYS_RW_PACKAGES}/org.tizen.ico.statusbar.xml
+%{TZ_SYS_RW_PACKAGES}/org.tizen.ico.onscreen.xml
 %{_libdir}/libico-appfw.*
 %{_libdir}/libico-state-machine.*
-/usr/apps/org.tizen.ico.system-controller
-/usr/share/packages/org.tizen.ico.system-controller.xml
-/usr/lib/systemd/user/ico-system-controller.service
-/usr/lib/systemd/user/ico-uxf-wait-launchpad-ready.path
-/usr/lib/systemd/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path
+%{TZ_SYS_RW_APP}/org.tizen.ico.system-controller
+%{TZ_SYS_RW_PACKAGES}/org.tizen.ico.system-controller.xml
+%{_libdir}/systemd/user/ico-system-controller.service
+%{_libdir}/systemd/user/ico-uxf-wait-launchpad-ready.path
+%{_libdir}/systemd/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path
 %{_bindir}/ico_clear_screen
 %{_bindir}/ico_change_loginuser
 %{_bindir}/ico_del_notification

diff --git a/proto-meta-Tizen_generic/specfile-initial/ico-vic-carsimulator/packaging/ico-vic-carsimulator.spec b/proto-meta-Tizen_generic/specfile-initial/ico-vic-carsimulator/packaging/ico-vic-carsimulator.spec
index e79f003..e04d966 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/ico-vic-carsimulator/packaging/ico-vic-carsimulator.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/ico-vic-carsimulator/packaging/ico-vic-carsimulator.spec
@@ -1,23 +1,19 @@
 Name:       ico-vic-carsimulator
 Summary:    CarSimulator
 Version:    0.9.10
-Release:    1.1
-Group:      System Environment/Daemons
-License:    Apache 2.0
+Release:    0
+Group:      Automotive/ICO Homescreen
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.bz2
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires:       glib2
-Requires:       ico-vic-amb-plugin
-Requires:       ico-uxf-utilities
-BuildRequires:  make
-BuildRequires:  automake
-BuildRequires:  boost-devel
-#BuildRequires:  libwebsockets-devel
-BuildRequires:  glib2-devel
-BuildRequires:  json-glib-devel
-#BuildRequires:  ico-uxf-utilities
-BuildRequires:  ico-uxf-utilities-devel
+Requires(post):     /sbin/ldconfig
+Requires(postun):   /sbin/ldconfig
+Requires:           ico-vic-amb-plugin
+Requires:           ico-uxf-utilities
+BuildRequires:      make
+BuildRequires:      automake
+BuildRequires:      glib2-devel
+BuildRequires:      json-glib-devel
+BuildRequires:      ico-uxf-utilities-devel
 
 %description
 CarSimulator is simulated driving software
@@ -26,20 +22,18 @@ CarSimulator is simulated driving software
 %setup -q -n %{name}-%{version}
 
 %build
-autoreconf --install
-
-%configure
-make %{?_smp_mflags}
+%reconfigure
+%__make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 %make_install
 
 # configurations
-mkdir -p %{buildroot}/etc/ico-vic-carsim/
-mkdir -p %{buildroot}/usr/lib/systemd/user/
-install -m 0644 G25.conf %{buildroot}/etc/ico-vic-carsim/
-install -m 0644 G27.conf %{buildroot}/etc/ico-vic-carsim/
+mkdir -p %{buildroot}%{_sysconfdir}/ico-vic-carsim/
+mkdir -p %{buildroot}%{_unitdir_user}
+install -m 0644 G25.conf %{buildroot}%{_sysconfdir}/ico-vic-carsim/
+install -m 0644 G27.conf %{buildroot}%{_sysconfdir}/ico-vic-carsim/
 install -m 0644 ico-vic-carsim.service %{buildroot}%{_unitdir_user}/ico-vic-carsim.service
 
 %post -p /sbin/ldconfig
@@ -50,5 +44,5 @@ install -m 0644 ico-vic-carsim.service %{buildroot}%{_unitdir_user}/ico-vic-cars
 %attr(4755,root,root) %{_bindir}/ico-vic-carsim
 %defattr(-,root,root,-)
 %{_bindir}/*
-/etc/ico-vic-carsim/*
-/usr/lib/systemd/user/ico-vic-carsim.service
+%config %{_sysconfdir}/ico-vic-carsim/*
+%{_unitdir_user}/ico-vic-carsim.service

diff --git a/proto-meta-Tizen_generic/specfile-initial/libpinyin/packaging/libpinyin.spec b/proto-meta-Tizen_generic/specfile-initial/libpinyin/packaging/libpinyin.spec
index f1e78e3..2a4bd7b 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/libpinyin/packaging/libpinyin.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/libpinyin/packaging/libpinyin.spec
@@ -1,6 +1,6 @@
 Name:           libpinyin
 Version:        1.0.0
-Release:        1
+Release:        0
 Summary:        Library to deal with pinyin
 License:        GPL-2.0+
 Group:          System/Libraries
@@ -8,13 +8,13 @@ URL:            https://github.com/libpinyin/libpinyin
 Source0:        http://downloads.sourceforge.net/libpinyin/libpinyin/%{name}-%{version}.tar.gz
 Source1001:     libpinyin.manifest
 
-BuildRequires:  db4-devel, glib2-devel
+BuildRequires:  db4-devel
+BuildRequires:  glib2-devel
 
 %description
 The libpinyin project aims to provide the algorithms core
 for intelligent sentence-based Chinese pinyin input methods.
 
-
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name} = %{version}-%{release}
@@ -23,7 +23,6 @@ Requires:       %{name} = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-
 %package        tools
 Summary:        Tools for %{name}
 Requires:       %{name} = %{version}-%{release}
@@ -31,36 +30,32 @@ Requires:       %{name} = %{version}-%{release}
 %description tools
 The %{name}-tools package contains tools.
 
-
 %prep
 %setup -q
 cp %{SOURCE1001} .
 
-
 %build
-%configure --disable-static
-make %{?_smp_mflags}
+%reconfigure --disable-static
+%__make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-
+%make_install DESTDIR=%{buildroot}
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %manifest %{name}.manifest
-%doc AUTHORS COPYING README
+%license COPYING
+%doc AUTHORS README
 %{_libdir}/*.so.*
 %dir %{_libdir}/libpinyin
 %{_libdir}/libpinyin/data
 
 %files devel
 %manifest %{name}.manifest
-%doc
 %dir %{_includedir}/libpinyin-1.0.0
 %{_includedir}/libpinyin-1.0.0/*
 %{_libdir}/*.so

diff --git a/proto-meta-Tizen_generic/specfile-initial/message-port-dbus/packaging/message-port.spec b/proto-meta-Tizen_generic/specfile-initial/message-port-dbus/packaging/message-port.spec
new file mode 100644 (file)
index 0000000..0ed32d2
--- /dev/null
+++ b/proto-meta-Tizen_generic/specfile-initial/message-port-dbus/packaging/message-port.spec
@@ -0,0 +1,131 @@
+
+%define build_tests 1
+%define use_session_bus 0
+%define systemddir /lib/systemd
+
+Name: message-port
+Summary: Message port daemon
+Version: 1.0.3
+Release: 1
+Group: System/Service
+License: LGPL-2.1+
+Source0: %{name}-%{version}.tar.gz
+Source1: %{name}.manifest
+
+BuildRequires: pkgconfig(aul)
+BuildRequires: pkgconfig(dlog)
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(gio-unix-2.0)
+BuildRequires: pkgconfig(glib-2.0) >= 2.30
+BuildRequires: pkgconfig(gobject-2.0)
+BuildRequires: pkgconfig(pkgmgr-info)
+
+%description
+This daemon allows the webapplications to communicates using 
+Tizen MessagePort WebAPI.
+
+
+%package -n lib%{name}
+Summary:    Client library for message port
+Group:      Base/Libraries
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires: %{name} = %{version}-%{release} 
+BuildRequires: pkgconfig(bundle)
+
+%description -n lib%{name}
+Client library that porvies C APIs to work with message port.
+
+
+%package -n lib%{name}-devel
+Summary:    Development files for libmessage-port 
+Group:      Development/Libraries
+Requires:   lib%{name} = %{version}-%{release}
+
+%description -n lib%{name}-devel
+Development files for message-port client library.
+
+%if %{build_tests} == 1
+
+%package -n %{name}-tests
+Summary: Unit tests for messageport
+Group: Development/Testing
+Requires: lib%{name} = %{version}-%{release}
+
+%description -n %{name}-tests
+Unit tests for messageport implementation.
+
+%endif
+
+
+%prep
+%setup -q -n %{name}-%{version}
+cp -a %{SOURCE1} .
+mkdir m4 > /dev/null
+autoreconf -f -i
+
+
+%build
+%configure \
+%if %{build_tests} == 1
+     --enable-tests\
+%endif
+%if %{use_session_bus} == 1
+    --enable-sessionbus \
+%endif
+
+make %{?_smp_mflags}
+
+
+%install
+%make_install
+
+mkdir -p ${RPM_BUILD_ROOT}%{systemddir}/system
+cp messageportd.service $RPM_BUILD_ROOT%{systemddir}/system
+
+%post
+/bin/systemctl enable messageportd.service
+
+%postun
+/bin/systemctl disable messageportd.service
+
+%post -n lib%{name}
+/sbin/ldconfig
+
+%postun -n lib%{name}
+/sbin/ldconfig
+
+
+# daemon: message-port
+%files -n %{name}
+%defattr(-,root,root,-)
+%{_bindir}/messageportd
+%if %{use_session_bus} == 1
+%{_datadir}/dbus-1/services/org.tizen.messageport.service
+%manifest %{name}.manifest
+%endif
+%{systemddir}/system/messageportd.service
+
+# libmessage-port
+%files -n lib%{name}
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING.LIB README
+%{_libdir}/lib%{name}.so*
+
+
+#libmessage-port-devel
+%files -n lib%{name}-devel
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%{_libdir}/pkgconfig/%{name}.pc
+%{_includedir}/*.h
+
+%if %{build_tests} == 1
+%files -n %{name}-tests
+%defattr(-,root,root,-)
+%manifest %{name}.manifest
+%{_bindir}/msgport-test-app
+%{_bindir}/msgport-test-app-cpp
+%endif

diff --git a/proto-meta-Tizen_generic/specfile-initial/murphy/packaging/murphy.spec b/proto-meta-Tizen_generic/specfile-initial/murphy/packaging/murphy.spec
index 54e7d36..f54ccb5 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/murphy/packaging/murphy.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/murphy/packaging/murphy.spec
@@ -83,7 +83,7 @@ BuildRequires: pkgconfig(json)
 BuildRequires: pkgconfig(libsmack)
 %endif
 
-%if %{?_with_icosyscon:0}%{!?_with_icosyscon:1}
+%if %{_with_icosyscon}
 BuildRequires: ico-uxf-weston-plugin-devel
 BuildRequires: pkgconfig(ail)
 BuildRequires: pkgconfig(aul)
@@ -214,7 +214,7 @@ Requires: %{name} = %{version}
 Summary: Murphy IVI resource manager plugin
 Group: System/Service
 
-%if %{?_with_icosyscon:0}%{!?_with_icosyscon:1}
+%if %{_with_icosyscon}
 %package system-controller
 Summary: Murphy IVI System Controller plugin
 Group: System/Service
@@ -281,7 +281,7 @@ This package contains various test binaries for Murphy.
 %description ivi-resource-manager
 This package contains the Murphy IVI resource manager plugin.
 
-%if %{?_with_icosyscon:0}%{!?_with_icosyscon:1}
+%if %{_with_icosyscon}
 %description system-controller
 This package contains the Murphy IVI resource manager plugin.
 %endif
@@ -353,7 +353,7 @@ CONFIG_OPTIONS="$CONFIG_OPTIONS --enable-smack"
 CONFIG_OPTIONS="$CONFIG_OPTIONS --disable-smack"
 %endif
 
-%if %{?_with_icosyscon:0}%{!?_with_icosyscon:1}
+%if %{_with_icosyscon}
 CONFIG_OPTIONS="$CONFIG_OPTIONS --enable-system-controller"
 %else
 CONFIG_OPTIONS="$CONFIG_OPTIONS --disable-system-controller"
@@ -423,7 +423,7 @@ cp packaging.in/murphyd.conf $RPM_BUILD_ROOT%{_tmpfilesdir}
 mkdir -p $RPM_BUILD_ROOT%{systemddir}/system
 mkdir -p $RPM_BUILD_ROOT%{systemddir}/user
 cp packaging.in/murphyd.service $RPM_BUILD_ROOT%{systemddir}/system
-%if %{?_with_icosyscon:0}%{!?_with_icosyscon:1}
+%if %{_with_icosyscon}
 cp packaging.in/ico-homescreen.service $RPM_BUILD_ROOT%{systemddir}/user
 cp packaging.in/murphy-wait-for-launchpad-ready.path $RPM_BUILD_ROOT%{systemddir}/user
 %endif
@@ -449,7 +449,7 @@ cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/murphy-pulse.manifest
 %if %{?_with_ecore:1}%{!?_with_ecore:0}
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/murphy-ecore.manifest
 %endif
-%if %{?_with_icosyscon:0}%{!?_with_icosyscon:1}
+%if %{_with_icosyscon}
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/murphy-system-controller.manifest
 %endif
 
@@ -507,7 +507,7 @@ lfconfig
 ldconfig
 %endif
 
-%if %{?_with_icosyscon:0}%{!?_with_icosyscon:1}
+%if %{_with_icosyscon}
 %post system-controller
 # prevent system controller from starting
 rm -f %{systemddir}/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path
@@ -697,7 +697,7 @@ fi
 %{_libdir}/murphy/plugins/plugin-ivi-resource-manager.so
 %manifest %{_datadir}/murphy-ivi-resource-manager.manifest
 
-%if %{?_with_icosyscon:0}%{!?_with_icosyscon:1}
+%if %{_with_icosyscon}
 %files system-controller
 %defattr(-,root,root,-)
 %{_libdir}/murphy/plugins/plugin-system-controller.so

diff --git a/proto-meta-Tizen_generic/specfile-initial/smack/packaging/smack.spec b/proto-meta-Tizen_generic/specfile-initial/smack/packaging/smack.spec
index 99af779..0ba1b20 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/smack/packaging/smack.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/smack/packaging/smack.spec
@@ -1,5 +1,5 @@
 Name:       smack
-Version:    1.0.3.1
+Version:    1.0.4
 Release:    1
 Summary:    Selection of tools for developers working with Smack
 Group:      Security/Access Control
@@ -10,6 +10,7 @@ Source1001:   smack.manifest
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: libtool
+BuildRequires: pkg-config
 
 %description
 Tools provided to load and unload rules from the kernel and query the policy