update spec file

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

diff --git a/proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/modello-homescreen.spec b/proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/modello-homescreen.spec
index 8e4f9a0..1c4eded 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/modello-homescreen.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/Modello_Homescreen/packaging/modello-homescreen.spec
@@ -2,15 +2,17 @@ Name:       Modello_Homescreen
 Summary:    A proof of concept pure html5 UI
 Version:    0.0.2
 Release:    1
-Group:      Applications/System
-License:    Apache 2.0
+Group:      Automotive/Modello
+License:    Apache-2.0
 URL:        http://www.tizen.org
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  zip
 Requires:   Modello_Common
+BuildArchitectures: noarch
+
 
 %description
-A proof of concept pure html5 UI
+A proof of concept pure html5 UI files
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -22,17 +24,17 @@ make wgtPkg
 %install
     %make_install
     mkdir -p %{buildroot}%{_bindir}
-    mkdir -p %{buildroot}%{_libdir}/systemd/user/weston.target.wants/
+    mkdir -p %{buildroot}%{_unitdir_user}/weston.target.wants/
     install -m 755 systemd/modello_launcher.sh %{buildroot}%{_bindir}
-    install -m 0644 systemd/Modello_Homescreen-launchpad-ready.path %{buildroot}%{_libdir}/systemd/user
-    install -m 0644 systemd/Modello_Homescreen.service %{buildroot}%{_libdir}/systemd/user
-    ln -sf systemd/Modello_Homescreen-launchpad-ready.path %{buildroot}%{_libdir}/systemd/user/weston.target.wants/
+    install -m 0644 systemd/Modello_Homescreen-launchpad-ready.path %{buildroot}%{_unitdir_user}
+    install -m 0644 systemd/Modello_Homescreen.service %{buildroot}%{_unitdir_user}
+    ln -sf ../Modello_Homescreen-launchpad-ready.path %{buildroot}%{_unitdir_user}/weston.target.wants/
 
 %files
 %defattr(-,root,root,-)
 /opt/usr/apps/.preinstallWidgets/Modello_Homescreen.wgt
 /opt/usr/apps/_common/icons/Homescreen_icon.png
-%{_libdir}/systemd/user/Modello_Homescreen.service
-%{_libdir}/systemd/user/Modello_Homescreen-launchpad-ready.path
+%{_unitdir_user}/Modello_Homescreen.service
+%{_unitdir_user}/Modello_Homescreen-launchpad-ready.path
 %{_bindir}/modello_launcher.sh
-%{_libdir}/systemd/user/weston.target.wants
+%{_unitdir_user}/weston.target.wants

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 e124478..95bc2c3 100755 (executable)
--- a/proto-meta-Tizen_generic/specfile-initial/ail/packaging/ail.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/ail/packaging/ail.spec
@@ -16,6 +16,7 @@ BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(xdgmime)
 BuildRequires:  pkgconfig(libtzplatform-config)
 Provides:       libail = %{version}-%{release}
+Requires:              libcap-tools
 
 %description
 Application Information Library package
@@ -24,6 +25,7 @@ Application Information Library package
 Summary:        Application Information Library Development files
 Requires:       libail = %{version}-%{release}
 Requires:       pkgconfig(libtzplatform-config)
+Requires:              pkgconfig(libsmack)
 
 %description devel
 Application Information Library Development files package
@@ -50,9 +52,6 @@ export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE"
 %install
 %make_install
 
-mkdir -p %{buildroot}%{TZ_SYS_DB}/
-mkdir -p %{buildroot}%{TZ_SYS_RW_DESKTOP_APP}/
-
 %post
 /sbin/ldconfig
 vconftool set -t string db/ail/ail_info "0" -f -s system::vconf_inhouse
@@ -65,32 +64,22 @@ chsmack -a User %TZ_SYS_CONFIG/db/menuscreen/desktop
 chsmack -a User %TZ_SYS_CONFIG/db/menu_widget
 chsmack -a User %TZ_SYS_CONFIG/db/menu_widget/language
 
-CHDBGID="6010"
-
-update_DAC_for_db_file()
-{
-        if [ ! -f $@ ]; then
-                touch $@
-        fi
-
-        chown :$CHDBGID $@ 2>/dev/null
-        if [ $? -ne 0 ]; then
-                echo "Failed to change the owner of $@"
-        fi
-        chmod 664 $@ 2>/dev/null
-        if [ $? -ne 0 ]; then
-                echo "Failed to change the perms of $@"
-        fi
-}
-ail_initdb 2>/dev/null
 mkdir -p %{TZ_SYS_RO_DESKTOP_APP}
 mkdir -p %{TZ_SYS_RW_DESKTOP_APP}
+mkdir -p %{TZ_SYS_RW_APP}
 mkdir -p %{TZ_SYS_DB}
 
-update_DAC_for_db_file %{TZ_SYS_DB}/.app_info.db
-update_DAC_for_db_file %{TZ_SYS_DB}/.app_info.db-journal
-chsmack -a 'User' %{TZ_SYS_DB}/.app_info.db*
+chsmack -a '*' %{TZ_SYS_DB}
+chsmack -a '*' %{TZ_SYS_RW_APP}
+chsmack -a '*' %{TZ_SYS_RW_DESKTOP_APP}
+chsmack -a '*' %{TZ_SYS_RO_DESKTOP_APP}
 
+chmod g+w %{TZ_SYS_RW_DESKTOP_APP}
+chmod g+w %{TZ_SYS_RO_DESKTOP_APP}
+
+ail_initdb 2>/dev/null
+chsmack -a '*' %{TZ_SYS_DB}/.app_info.db*
+ 
 %postun
 /sbin/ldconfig
 if [ $1 == 0 ]; then
@@ -100,9 +89,7 @@ fi
 %files
 %manifest %{name}.manifest
 %license LICENSE
-%dir %{TZ_SYS_RW_DESKTOP_APP}
-%{_bindir}/ail_initdb
-%{_bindir}/ail_initdb
+%attr(06775,root,root) %{_bindir}/ail_initdb
 %{_bindir}/ail_fota
 %{_bindir}/ail_desktop
 %{_bindir}/ail_filter

diff --git a/proto-meta-Tizen_generic/specfile-initial/app-core/packaging/app-core.spec b/proto-meta-Tizen_generic/specfile-initial/app-core/packaging/app-core.spec
index 8c24e65..e291ce5 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/app-core/packaging/app-core.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/app-core/packaging/app-core.spec
@@ -104,7 +104,7 @@ cp %{SOURCE1001} .
 %endif
 -DENABLE_GTK=OFF
 
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 
 %install
@@ -140,8 +140,8 @@ install -m0644 %{SOURCE101} %{buildroot}%{_unitdir_user}/core-efl.target
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libappcore-common.so.*
-%{_prefix}/lib/systemd/user/core-efl.target
-%{_prefix}/lib/systemd/user/core-efl.target.wants/
+%{_unitdir_user}/core-efl.target
+%{_unitdir_user}/core-efl.target.wants/
 %license LICENSE
 
 %files common-devel

diff --git a/proto-meta-Tizen_generic/specfile-initial/aul-1/packaging/aul.spec b/proto-meta-Tizen_generic/specfile-initial/aul-1/packaging/aul.spec
index ae9b46a..f183011 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/aul-1/packaging/aul.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/aul-1/packaging/aul.spec
@@ -10,11 +10,11 @@ Source102:  ac.service
 Source103:  amd_session_agent.service
 Source1001: %{name}.manifest
 
-Requires(post): /sbin/ldconfig
-Requires(post): /usr/bin/systemctl
+Requires(post):   /sbin/ldconfig
+Requires(post):   /usr/bin/systemctl
 Requires(postun): /sbin/ldconfig
 Requires(postun): /usr/bin/systemctl
-Requires(preun): /usr/bin/systemctl
+Requires(preun):  /usr/bin/systemctl
 
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dbus-glib-1)
@@ -28,6 +28,7 @@ BuildRequires:  pkgconfig(app-checker)
 BuildRequires:  pkgconfig(app-checker-server)
 BuildRequires:  pkgconfig(rua)
 BuildRequires:  pkgconfig(vconf)
+BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  libattr-devel
 BuildRequires:  pkgconfig(privacy-manager-client)
@@ -56,34 +57,33 @@ CFLAGS="%{optflags} -D__emul__"; export CFLAGS
 %endif
 
 %cmake .
-
-make %{?jobs:-j%jobs}
+%__make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}/etc/init.d
-install -m 755 launchpad_run %{buildroot}/etc/init.d
+mkdir -p %{buildroot}%{_sysconfdir}/init.d
+install -m 755 launchpad_run %{buildroot}%{_sysconfdir}/init.d
 
-mkdir -p %{buildroot}/etc/rc.d/rc3.d
-mkdir -p %{buildroot}/etc/rc.d/rc4.d
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc4.d
 ln -sf ../../init.d/launchpad_run %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S34launchpad_run
 ln -sf ../../init.d/launchpad_run %{buildroot}/%{_sysconfdir}/rc.d/rc4.d/S80launchpad_run
 
 mkdir -p %{buildroot}%{TZ_SYS_DB}
-sqlite3 %{buildroot}%{TZ_SYS_DB}/.mida.db < %{buildroot}/usr/share/aul/mida_db.sql
-rm -rf %{buildroot}/usr/share/aul/mida_db.sql
+sqlite3 %{buildroot}%{TZ_SYS_DB}/.mida.db < %{buildroot}%{_datadir}/aul/mida_db.sql
+rm -rf %{buildroot}%{_datadir}/aul/mida_db.sql
 
-mkdir -p %{buildroot}/usr/lib/systemd/system/graphical.target.wants
-mkdir -p %{buildroot}/usr/lib/systemd/user/default.target.wants
-install -m 0644 %SOURCE101 %{buildroot}/usr/lib/systemd/system/launchpad-preload@.service
-install -m 0644 %SOURCE102 %{buildroot}/usr/lib/systemd/system/ac.service
-ln -s ../launchpad-preload@.service %{buildroot}/usr/lib/systemd/system/graphical.target.wants/launchpad-preload@5000.service
-ln -s ../ac.service %{buildroot}/usr/lib/systemd/system/graphical.target.wants/ac.service
+mkdir -p %{buildroot}%{_unitdir}/graphical.target.wants
+mkdir -p %{buildroot}%{_unitdir_user}/default.target.wants
+install -m 0644 %SOURCE101 %{buildroot}%{_unitdir}/launchpad-preload@.service
+install -m 0644 %SOURCE102 %{buildroot}%{_unitdir}/ac.service
+ln -s ../launchpad-preload@.service %{buildroot}%{_unitdir}/graphical.target.wants/launchpad-preload@5000.service
+ln -s ../ac.service %{buildroot}%{_unitdir}/graphical.target.wants/ac.service
 
-install -m 0644 %SOURCE103 %{buildroot}/usr/lib/systemd/user/amd_session_agent.service
-ln -s ../amd_session_agent.service %{buildroot}/usr/lib/systemd/user/default.target.wants/amd_session_agent.service
+install -m 0644 %SOURCE103 %{buildroot}%{_unitdir_user}/amd_session_agent.service
+ln -s ../amd_session_agent.service %{buildroot}%{_unitdir_user}/default.target.wants/amd_session_agent.service
 
 %preun
 if [ $1 == 0 ]; then
@@ -120,21 +120,21 @@ systemctl daemon-reload
 %{_bindir}/launch_app
 %{_bindir}/open_app
 %{_bindir}/amd_session_agent
-/usr/share/aul/miregex/*
-/usr/share/aul/service/*
-/usr/share/aul/preload_list.txt
-/usr/share/aul/preexec_list.txt
-/usr/lib/systemd/system/graphical.target.wants/launchpad-preload@5000.service
-/usr/lib/systemd/system/graphical.target.wants/ac.service
-/usr/lib/systemd/system/launchpad-preload@.service
-/usr/lib/systemd/system/ac.service
-/usr/lib/systemd/user/amd_session_agent.service
-/usr/lib/systemd/user/default.target.wants/amd_session_agent.service
-/usr/bin/amd
-/usr/bin/daemon-manager-release-agent
-/usr/bin/daemon-manager-launch-agent
+%{_datadir}/aul/miregex/*
+%{_datadir}/aul/service/*
+%{_datadir}/aul/preload_list.txt
+%{_datadir}/aul/preexec_list.txt
+%{_unitdir}/graphical.target.wants/launchpad-preload@5000.service
+%{_unitdir}/graphical.target.wants/ac.service
+%{_unitdir}/launchpad-preload@.service
+%{_unitdir}/ac.service
+%{_unitdir_user}/amd_session_agent.service
+%{_unitdir_user}/default.target.wants/amd_session_agent.service
+%{_bindir}/amd
+%{_bindir}/daemon-manager-release-agent
+%{_bindir}/daemon-manager-launch-agent
 
 %files devel
-/usr/include/aul/*.h
+%{_includedir}/aul/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc

diff --git a/proto-meta-Tizen_generic/specfile-initial/contacts-service/packaging/contacts-service.spec b/proto-meta-Tizen_generic/specfile-initial/contacts-service/packaging/contacts-service.spec
index a653f28..daff01c 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/contacts-service/packaging/contacts-service.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/contacts-service/packaging/contacts-service.spec
@@ -1,8 +1,8 @@
 Name:       contacts-service
 Summary:    Contacts Service
-Version: 0.10.3
+Version:    0.10.3
 Release:    1
-Group:      Social & Contents/Contacts
+Group:      Social & Contents/Pim
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    contacts-service.service
@@ -35,19 +35,18 @@ Requires(postun): /sbin/ldconfig
 Contacts Service Library
 
 %package -n contacts-service2
-Summary:       New Contacts service library
+Summary:        New Contacts service library
 Requires(post): libprivilege-control-conf
 
 %description -n contacts-service2
-New Contact Serivce Library
-
+New Contact Serivce Library files
 
 %package -n contacts-service2-devel
 Summary:    New Contacts Service  (devel)
 Requires:   %{name}2 = %{version}-%{release}
 
 %description -n contacts-service2-devel
-New Contacts Service Library (devel)
+New Contacts Service Library (devel) files
 
 %prep
 %setup -q
@@ -56,20 +55,20 @@ cp %{SOURCE3} .
 
 %build
 %cmake . -DTZ_SYS_ETC=%TZ_SYS_ETC
-make %{?_smp_mflags}
+%__make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}/usr/lib/systemd/user/tizen-middleware.target.wants
-install -m 0644 %SOURCE1 %{buildroot}/usr/lib/systemd/user/contacts-service.service
-ln -s ../contacts-service.service %{buildroot}/usr/lib/systemd/user/tizen-middleware.target.wants/contacts-service.service
+mkdir -p %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants
+install -m 0644 %SOURCE1 %{buildroot}%{_unitdir_user}/contacts-service.service
+ln -s ../contacts-service.service %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants/contacts-service.service
 
-mkdir -p %{buildroot}/usr/lib/systemd/user/sockets.target.wants
-install -m 0644 %SOURCE2 %{buildroot}/usr/lib/systemd/user/contacts-service.socket
-ln -s ../contacts-service.socket %{buildroot}/usr/lib/systemd/user/sockets.target.wants/contacts-service.socket
+mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
+install -m 0644 %SOURCE2 %{buildroot}%{_unitdir_user}/contacts-service.socket
+ln -s ../contacts-service.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/contacts-service.socket
 
 
 %post -n contacts-service2
@@ -91,10 +90,10 @@ vconftool set -t int db/contacts-svc/phonenumber_min_match_digit 8 -g 6005 -s co
 %defattr(-,root,root,-)
 %{_libdir}/libcontacts-service2.so.*
 %{_bindir}/contacts-service-ipcd*
-/usr/lib/systemd/user/contacts-service.service
-/usr/lib/systemd/user/tizen-middleware.target.wants/contacts-service.service
-/usr/lib/systemd/user/sockets.target.wants/contacts-service.socket
-/usr/lib/systemd/user/contacts-service.socket
+%{_unitdir_user}/contacts-service.service
+%{_unitdir_user}/tizen-middleware.target.wants/contacts-service.service
+%{_unitdir_user}/sockets.target.wants/contacts-service.socket
+%{_unitdir_user}/contacts-service.socket
 
 %files -n contacts-service2-devel
 %defattr(-,root,root,-)

diff --git a/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec b/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec
index 0701570..ef27689 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/crosswalk/packaging/crosswalk.spec
@@ -12,9 +12,9 @@
 
 
 Name:           crosswalk
-Version:        9.37.193.0
+Version:        9.38.205.0
 Release:        0
-Summary:        Crosswalk is an app runtime based on Chromium
+Summary:        Chromium-based app runtime
 License:        (BSD-3-Clause and LGPL-2.1+)
 Group:          Web Framework/Web Run Time
 Url:            https://github.com/otcshare/crosswalk
@@ -58,11 +58,13 @@ BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libpci)
 BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(tizen-platform-wrapper)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(pkgmgr)
 BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  pkgconfig(pkgmgr-installer)
 BuildRequires:  pkgconfig(pkgmgr-parser)
@@ -85,6 +87,11 @@ BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xtst)
 %endif
 
+%if "%{profile}" == "ivi"
+BuildRequires:  pkgconfig(murphy-common)
+BuildRequires:  pkgconfig(murphy-resource)
+%endif
+
 %if %{with wayland}
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
@@ -161,7 +168,7 @@ if [ -n "${BUILDDIR_NAME}" ]; then
 fi
 
 %if %{with wayland}
-GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=0"
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_ozone=1 -Denable_ozone_wayland_vkb=1 -Denable_xdg_shell=1"
 %endif
 
 # Force gold binary from chroot ld.gold provided by binutils-gold
@@ -170,16 +177,6 @@ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_nacl=%{_disable_nacl} -Dlinux_use_
 # Linking fails in Tizen Common when fatal ld warnings are enabled. XWALK-1379.
 GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Ddisable_fatal_linker_warnings=1"
 
-# Temporarily disable Alsa support while snd_seq_* support is not enabled on
-# Tizen. See https://codereview.chromium.org/264973012 and
-# https://review.tizen.org/gerrit/#/c/24336/
-GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Duse_alsa=0"
-
-# Temporarily disable WebRTC support because its build currently hardcodes
-# dependencies on X11 and OpenSSL. We are still trying to get some
-# clarifications as to whether this is really necessary. See XWALK-2160.
-GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Denable_webrtc=0"
-
 # For building for arm in OBS, we need :
 # -> to unset sysroot value.
 # sysroot variable is automatically set for cross compilation to use arm-sysroot provided by Chromium project
@@ -194,6 +191,10 @@ export CXXFLAGS=`echo $CXXFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
 export FFLAGS=`echo $FFLAGS | sed s,-mfpu=vfpv3,-mfpu=neon,g`
 %endif
 
+%if "%{profile}" == "ivi"
+GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Denable_murphy=1"
+%endif
+
 # --no-parallel is added because chroot does not mount a /dev/shm, this will
 # cause python multiprocessing.SemLock error.
 export GYP_GENERATORS='ninja'
@@ -201,6 +202,7 @@ export GYP_GENERATORS='ninja'
 --no-parallel \
 ${GYP_EXTRA_FLAGS} \
 -Dchromeos=0 \
+-Dclang=0 \
 -Dtizen=1 \
 -Dpython_ver=2.7 \
 -Duse_aura=1 \
@@ -215,7 +217,7 @@ ${GYP_EXTRA_FLAGS} \
 -Dshared_process_mode=1 \
 -Denable_hidpi=1
 
-ninja %{?_smp_mflags} -C src/out/Release xwalk xwalkctl xwalk_launcher xwalk-pkg-helper
+ninja %{?_smp_mflags} -C src/out/Release xwalk xwalkctl xwalk_launcher xwalk-pkg-helper xwalk-backendlib
 
 %install
 # Binaries.
@@ -225,17 +227,19 @@ install -p -D src/out/Release/xwalk %{buildroot}%{_libdir}/xwalk/xwalk
 install -p -D src/out/Release/xwalkctl %{buildroot}%{_bindir}/xwalkctl
 install -p -D src/out/Release/xwalk-launcher %{buildroot}%{_bindir}/xwalk-launcher
 # xwalk-pkg-helper needs to be set-user-ID-root so it can finish the installation process.
-install -m 06755 -p -D src/out/Release/xwalk-pkg-helper %{buildroot}%{_bindir}/xwalk-pkg-helper
+install -m 0777 -p -D src/out/Release/xwalk-pkg-helper %{buildroot}%{_bindir}/xwalk-pkg-helper
+install -p -D src/out/Release/lib/libxwalk-backendlib.so %{buildroot}%{_libdir}/xwalk/libxwalk-backendlib.so
+install -p -D src/xwalk/application/tools/tizen/xwalk_backend_wrapper.sh %{buildroot}%{_libdir}/xwalk/xwalk_backend_wrapper.sh
 
 # Supporting libraries and resources.
 install -p -D src/out/Release/icudtl.dat %{buildroot}%{_libdir}/xwalk/icudtl.dat
 install -p -D src/out/Release/libffmpegsumo.so %{buildroot}%{_libdir}/xwalk/libffmpegsumo.so
 install -p -D src/out/Release/xwalk.pak %{buildroot}%{_libdir}/xwalk/xwalk.pak
+mkdir -p %{buildroot}%{_datadir}/xwalk
+install -p -D src/xwalk/application/common/tizen/configuration/*.xsd %{buildroot}%{_datadir}/xwalk/
 
 # PNaCl
 %if ! %{_disable_nacl}
-install -p -D src/out/Release/libppGoogleNaClPluginChrome.so %{buildroot}%{_libdir}/xwalk/libppGoogleNaClPluginChrome.so
-install -p -D src/out/Release/nacl_bootstrap_munge_phdr %{buildroot}%{_libdir}/xwalk/nacl_bootstrap_munge_phdr
 install -p -D src/out/Release/nacl_bootstrap_raw %{buildroot}%{_libdir}/xwalk/nacl_bootstrap_raw
 install -p -D src/out/Release/nacl_helper %{buildroot}%{_libdir}/xwalk/nacl_helper
 install -p -D src/out/Release/nacl_helper_bootstrap %{buildroot}%{_libdir}/xwalk/nacl_helper_bootstrap
@@ -252,6 +256,17 @@ install -p -D %{name}.png %{buildroot}%{_desktop_icondir}/%{name}.png
 mkdir -p %{_desktop_icondir_ro}
 mkdir -p %{_manifestdir_ro}
 
+ln -sf %{_libdir}/xwalk/libxwalk-backendlib.so /etc/package-manager/backendlib/libxpk.so
+ln -sf %{_libdir}/xwalk/libxwalk-backendlib.so /etc/package-manager/backendlib/libwgt.so
+ln -sf %{_libdir}/xwalk/xwalk_backend_wrapper.sh /etc/package-manager/backend/xpk
+ln -sf %{_libdir}/xwalk/xwalk_backend_wrapper.sh /etc/package-manager/backend/wgt
+
+%preun
+[ -L /etc/package-manager/backendlib/libxpk.so ] && rm /etc/package-manager/backendlib/libxpk.so
+[ -L /etc/package-manager/backendlib/libwgt.so ] && rm /etc/package-manager/backendlib/libwgt.so
+[ -L /etc/package-manager/backend/xpk ] && rm /etc/package-manager/backend/xpk
+[ -L /etc/package-manager/backend/wgt ] && rm /etc/package-manager/backend/wgt
+
 %files
 %manifest %{name}.manifest
 %license AUTHORS.chromium LICENSE.chromium LICENSE.xwalk
@@ -261,8 +276,6 @@ mkdir -p %{_manifestdir_ro}
 %{_libdir}/xwalk/icudtl.dat
 %{_libdir}/xwalk/libffmpegsumo.so
 %if ! %{_disable_nacl}
-%{_libdir}/xwalk/libppGoogleNaClPluginChrome.so
-%{_libdir}/xwalk/nacl_bootstrap_munge_phdr
 %{_libdir}/xwalk/nacl_bootstrap_raw
 %{_libdir}/xwalk/nacl_helper
 %{_libdir}/xwalk/nacl_helper_bootstrap
@@ -271,7 +284,10 @@ mkdir -p %{_manifestdir_ro}
 %endif
 %{_libdir}/xwalk/xwalk
 %{_libdir}/xwalk/xwalk.pak
+%{_libdir}/xwalk/libxwalk-backendlib.so
+%{_libdir}/xwalk/xwalk_backend_wrapper.sh
 %{_manifestdir}/%{name}.xml
 %{_desktop_icondir}/%{name}.png
 %{_dbusservicedir}/org.crosswalkproject.Runtime1.service
 %{_systemduserservicedir}/xwalk.service
+%{_datadir}/xwalk/*

diff --git a/proto-meta-Tizen_generic/specfile-initial/evolution-data-server/packaging/evolution-data-server.spec b/proto-meta-Tizen_generic/specfile-initial/evolution-data-server/packaging/evolution-data-server.spec
index 08a27d7..7439cc3 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/evolution-data-server/packaging/evolution-data-server.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/evolution-data-server/packaging/evolution-data-server.spec
@@ -1,4 +1,4 @@
-%define baseline 3.9
+%define baseline 3.12
 
 %define USE_EVOLDAP 0
 %define with_introspection 1
@@ -10,18 +10,18 @@
 %define enable_email no
 
 # should match configure.ac
-%define so_edataserver 17
-%define so_ecal 15
-%define so_edata_cal 20
-%define so_edata_book 17
+%define so_edataserver 18
+%define so_ecal 16
+%define so_edata_cal 23
+%define so_edata_book 20
 %define so_ebook 14
-%define so_camel 43
-%define so_ebackend 6
-%define _evo_version 3.9
+%define so_camel 49
+%define so_ebackend 7
+%define _evo_version 3.12
 
 
 Name:           evolution-data-server
-Version:        3.9.90
+Version:        3.12.2
 Release:        0
 Summary:        Evolution Data Server
 License:        LGPL-2.0+
@@ -59,7 +59,7 @@ BuildRequires:  pkgconfig(oauth)
 %endif
 BuildRequires:  pkgconfig(libical) >= 0.43
 BuildRequires:  pkgconfig(libsecret-unstable) >= 0.5
-BuildRequires:  pkgconfig(libsoup-2.4) >= 2.40.3
+BuildRequires:  pkgconfig(libsoup-2.4) >= 2.42
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(python-2.7)
 BuildRequires:  pkgconfig(sqlite3) >= 3.5
@@ -272,6 +272,7 @@ This package contains developer documentation.
  --disable-vala-bindings \
  --disable-introspection \
 %endif
+ --disable-examples \
  # end of configure line
 
 make %{?_smp_mflags} V=1
@@ -328,7 +329,6 @@ mv evolution-data-server-%{_evo_version}.lang evolution-data-server.lang
 %defattr(-,root,root)
 %license COPYING
 %{_datadir}/GConf/gsettings/evolution-data-server.convert
-%{_datadir}/GConf/gsettings/libedataserver.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.Evolution.DefaultSources.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.eds-shell.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.network-config.gschema.xml

diff --git a/proto-meta-Tizen_generic/specfile-initial/package-manager/packaging/capi-appfw-package-manager.spec b/proto-meta-Tizen_generic/specfile-initial/package-manager/packaging/capi-appfw-package-manager.spec
index 2a94399..011c782 100755 (executable)
--- a/proto-meta-Tizen_generic/specfile-initial/package-manager/packaging/capi-appfw-package-manager.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/package-manager/packaging/capi-appfw-package-manager.spec
@@ -14,6 +14,7 @@ BuildRequires:  pkgconfig(ail)
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(aul)
 BuildRequires:  pkgconfig(capi-base-common)
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
 The Package Manager API provides functions to install, uninstall the package,

diff --git a/proto-meta-Tizen_generic/specfile-initial/security-server/packaging/security-server.spec b/proto-meta-Tizen_generic/specfile-initial/security-server/packaging/security-server.spec
index ccc85ae..680e679 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/security-server/packaging/security-server.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/security-server/packaging/security-server.spec
@@ -71,56 +71,60 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 export LDFLAGS+="-Wl,--rpath=%{_libdir}"
 
 %cmake . -DVERSION=%{version} \
-        -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \
-        -DCMAKE_VERBOSE_MAKEFILE=ON
-make %{?jobs:-j%jobs}
+         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \
+         -DCMAKE_VERBOSE_MAKEFILE=ON \
+         -DSYSTEMD_DIR=%{_unitdir}
+
+%__make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE %{buildroot}/usr/share/license/%{name}
-cp LICENSE %{buildroot}/usr/share/license/libsecurity-server-client
-mkdir -p %{buildroot}/etc/security/
-cp security-server-audit.conf %{buildroot}/etc/security/
+mkdir -p %{buildroot}%{_datadir}/license
+cp LICENSE %{buildroot}%{_datadir}/license/%{name}
+cp LICENSE %{buildroot}%{_datadir}/license/libsecurity-server-client
+mkdir -p %{buildroot}%{_sysconfdir}/security/
+cp security-server-audit.conf %{buildroot}%{_sysconfdir}/security/
 %make_install
 
-mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
-mkdir -p %{buildroot}/usr/lib/systemd/system/sockets.target.wants
-ln -s ../security-server.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/security-server.service
-ln -s ../security-server-data-share.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-data-share.socket
-ln -s ../security-server-get-gid.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-get-gid.socket
-ln -s ../security-server-privilege-by-pid.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-privilege-by-pid.socket
-ln -s ../security-server-cookie-get.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-cookie-get.socket
-ln -s ../security-server-cookie-check.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-cookie-check.socket
-ln -s ../security-server-app-privilege-by-name.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-app-privilege-by-name.socket
-ln -s ../security-server-password-check.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-password-check.socket
-ln -s ../security-server-password-set.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-password-set.socket
-ln -s ../security-server-password-reset.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/security-server-password-reset.socket
+mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants
+ln -s ../security-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/security-server.service
+ln -s ../security-server-data-share.socket %{buildroot}%{_unitdir}/sockets.target.wants/security-server-data-share.socket
+ln -s ../security-server-get-gid.socket    %{buildroot}%{_unitdir}/sockets.target.wants/security-server-get-gid.socket
+ln -s ../security-server-privilege-by-pid.socket %{buildroot}%{_unitdir}/sockets.target.wants/security-server-privilege-by-pid.socket
+ln -s ../security-server-cookie-get.socket %{buildroot}%{_unitdir}/sockets.target.wants/security-server-cookie-get.socket
+ln -s ../security-server-cookie-check.socket %{buildroot}%{_unitdir}/sockets.target.wants/security-server-cookie-check.socket
+ln -s ../security-server-app-privilege-by-name.socket %{buildroot}%{_unitdir}/sockets.target.wants/security-server-app-privilege-by-name.socket
+ln -s ../security-server-password-check.socket %{buildroot}%{_unitdir}/sockets.target.wants/security-server-password-check.socket
+ln -s ../security-server-password-set.socket %{buildroot}%{_unitdir}/sockets.target.wants/security-server-password-set.socket
+ln -s ../security-server-password-reset.socket %{buildroot}%{_unitdir}/sockets.target.wants/security-server-password-reset.socket
 
 %clean
 rm -rf %{buildroot}
 
 %post
+ldconfig
 systemctl daemon-reload
 if [ $1 = 1 ]; then
-    # installation
+# installation
     systemctl start security-server.service
 fi
 
 if [ $1 = 2 ]; then
-    # update
+# update
     systemctl restart security-server.service
 fi
 
 %preun
 if [ $1 = 0 ]; then
-    # unistall
+# unistall
     systemctl stop security-server.service
 fi
 
-%postun
+%postun 
+ldconfig
 if [ $1 = 0 ]; then
-    # unistall
+# unistall
     systemctl daemon-reload
 fi
 
@@ -131,31 +135,30 @@ fi
 %files -n security-server
 %manifest security-server.manifest
 %defattr(-,root,root,-)
-%attr(755,root,root) /usr/bin/security-server
+%attr(755,root,root) %{_bindir}/security-server
 %{_libdir}/libsecurity-server-commons.so.*
-%attr(-,root,root) /usr/lib/systemd/system/multi-user.target.wants/security-server.service
-%attr(-,root,root) /usr/lib/systemd/system/security-server.service
-%attr(-,root,root) /usr/lib/systemd/system/security-server.target
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-data-share.socket
-%attr(-,root,root) /usr/lib/systemd/system/security-server-data-share.socket
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-get-gid.socket
-%attr(-,root,root) /usr/lib/systemd/system/security-server-get-gid.socket
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-privilege-by-pid.socket
-%attr(-,root,root) /usr/lib/systemd/system/security-server-privilege-by-pid.socket
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-cookie-get.socket
-%attr(-,root,root) /usr/lib/systemd/system/security-server-cookie-get.socket
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-cookie-check.socket
-%attr(-,root,root) /usr/lib/systemd/system/security-server-cookie-check.socket
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-app-privilege-by-name.socket
-%attr(-,root,root) /usr/lib/systemd/system/security-server-app-privilege-by-name.socket
-%attr(-,root,root) /etc/security/security-server-audit.conf
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-password-check.socket
-%attr(-,root,root) /usr/lib/systemd/system/security-server-password-check.socket
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-password-set.socket
-%attr(-,root,root) /usr/lib/systemd/system/security-server-password-set.socket
-%attr(-,root,root) /usr/lib/systemd/system/sockets.target.wants/security-server-password-reset.socket
-%attr(-,root,root) /usr/lib/systemd/system/security-server-password-reset.socket
-
+%attr(-,root,root) %{_unitdir}/multi-user.target.wants/security-server.service
+%attr(-,root,root) %{_unitdir}/security-server.service
+%attr(-,root,root) %{_unitdir}/security-server.target
+%attr(-,root,root) %{_unitdir}/sockets.target.wants/security-server-data-share.socket
+%attr(-,root,root) %{_unitdir}/security-server-data-share.socket
+%attr(-,root,root) %{_unitdir}/sockets.target.wants/security-server-get-gid.socket
+%attr(-,root,root) %{_unitdir}/security-server-get-gid.socket
+%attr(-,root,root) %{_unitdir}/sockets.target.wants/security-server-privilege-by-pid.socket
+%attr(-,root,root) %{_unitdir}/security-server-privilege-by-pid.socket
+%attr(-,root,root) %{_unitdir}/sockets.target.wants/security-server-cookie-get.socket
+%attr(-,root,root) %{_unitdir}/security-server-cookie-get.socket
+%attr(-,root,root) %{_unitdir}/sockets.target.wants/security-server-cookie-check.socket
+%attr(-,root,root) %{_unitdir}/security-server-cookie-check.socket
+%attr(-,root,root) %{_unitdir}/sockets.target.wants/security-server-app-privilege-by-name.socket
+%attr(-,root,root) %{_unitdir}/security-server-app-privilege-by-name.socket
+%config %attr(-,root,root) %{_sysconfdir}/security/security-server-audit.conf
+%attr(-,root,root) %{_unitdir}/sockets.target.wants/security-server-password-check.socket
+%attr(-,root,root) %{_unitdir}/security-server-password-check.socket
+%attr(-,root,root) %{_unitdir}/sockets.target.wants/security-server-password-set.socket
+%attr(-,root,root) %{_unitdir}/security-server-password-set.socket
+%attr(-,root,root) %{_unitdir}/sockets.target.wants/security-server-password-reset.socket
+%attr(-,root,root) %{_unitdir}/security-server-password-reset.socket
 %{_datadir}/license/%{name}
 
 %files -n libsecurity-server-client
@@ -169,5 +172,5 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/libsecurity-server-client.so
 %{_libdir}/libsecurity-server-commons.so
-/usr/include/security-server/security-server.h
+%{_includedir}/security-server/security-server.h
 %{_libdir}/pkgconfig/*.pc

diff --git a/proto-meta-Tizen_generic/specfile-initial/slp-pkgmgr/packaging/pkgmgr.spec b/proto-meta-Tizen_generic/specfile-initial/slp-pkgmgr/packaging/pkgmgr.spec
index 463276e..e882b58 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/slp-pkgmgr/packaging/pkgmgr.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/slp-pkgmgr/packaging/pkgmgr.spec
@@ -30,6 +30,9 @@ BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgmgr-info-parser-devel
 BuildRequires:  pkgmgr-info-parser
+BuildRequires:  libsmack
+Requires:  pwdutils
+Requires:              libcap-tools
 
 %description
 Packager Manager client library package for packaging
@@ -113,7 +116,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/package-manager/server
 
 %find_lang package-manager
 
-
 %post
 /sbin/ldconfig
 
@@ -121,6 +123,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/package-manager/server
 # Update mime database to support package mime types
 update-mime-database /usr/share/mime
 
+# Create tizenglobalapp user needed for global installation
+%{_sbindir}/useradd -d %TZ_SYS_RW_APP -m %TZ_SYS_GLOBALAPP_USER -r -c "system user for common applications" -g root
+
+#mkdir -p %TZ_SYS_RW_APP/.config/xwalk-service/applications
+#cd %TZ_SYS_RW_APP/
+#ln -s .config/xwalk-service/applications/
+
 %post -n pkgmgr-server -p /sbin/ldconfig
 
 %post -n pkgmgr-client -p /sbin/ldconfig
@@ -140,7 +149,7 @@ update-mime-database /usr/share/mime
 %dir %{_sysconfdir}/opt/upgrade
 %{_sysconfdir}/opt/upgrade/pkgmgr.patch.sh
 %{_bindir}/pkgcmd
-%{_bindir}/pkg_initdb
+%attr(06755,root,root) %{_bindir}/pkg_initdb
 %{_bindir}/pkg_getsize
 %{_bindir}/pkginfo
 %{_bindir}/pkgmgr-install