update spec file

[scm/bb/tizen.git] / proto-meta-Tizen_generic / specfile-initial / bluetooth-frwk / packaging / bluetooth-frwk.spec

diff --git a/proto-meta-Tizen_generic/specfile-initial/bluetooth-frwk/packaging/bluetooth-frwk.spec b/proto-meta-Tizen_generic/specfile-initial/bluetooth-frwk/packaging/bluetooth-frwk.spec
index c84ab48..597246a 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/bluetooth-frwk/packaging/bluetooth-frwk.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/bluetooth-frwk/packaging/bluetooth-frwk.spec
@@ -1,6 +1,6 @@
 %bcond_with bluetooth_frwk_libnotify
 %bcond_with bluetooth_frwk_libnotification
-%bcond_with multi_user
+%bcond_with x
 
 Name:       bluetooth-frwk
 Summary:    Bluetooth framework for BlueZ and Obexd
@@ -13,7 +13,6 @@ Source1001: bluetooth-frwk.manifest
 Source1002: bt-icon.png
 URL:        https://review.tizen.org/git/?p=platform/core/connectivity/bluetooth-frwk.git;a=summary
 Requires: dbus
-Requires: syspopup
 Requires: bluetooth-tools
 BuildRequires:  pkgconfig(aul)
 BuildRequires:  pkgconfig(dbus-glib-1)
@@ -23,13 +22,16 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
-%else
+%elif %{without bluetooth_frwk_libnotification}
 BuildRequires:  pkgconfig(syspopup-caller)
+Requires:       syspopup
 %endif
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(dbus-1)
+%if %{with x}
 BuildRequires:  pkgconfig(utilX)
+%endif
 BuildRequires:  pkgconfig(capi-network-tethering)
 BuildRequires:  pkgconfig(libprivilege-control)
 BuildRequires:  pkgconfig(status)
@@ -37,6 +39,7 @@ BuildRequires:  pkgconfig(alarm-service)
 BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(security-server)
 BuildRequires:  cmake
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 Requires(post): vconf
 Requires(post): /sbin/ldconfig
@@ -68,6 +71,7 @@ This package is Bluetooth Service daemon to manage BT services.
 Summary:    Bluetooth Core daemon
 Group:      Network & Connectivity/Bluetooth
 Requires:   %{name} = %{version}-%{release}
+Requires:   connman
 
 %description core
 This package is Bluetooth core daemon to manage activation / deactivation.
@@ -81,17 +85,15 @@ cp %{SOURCE1001} .
 
 %ifarch x86_64
 export CFLAGS+="   -Wall -g -fvisibility=hidden -fPIC"
-export LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs" 
+export LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs"
 %else
 export CFLAGS+=" -fpie"
 export LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie"
 %endif
+
 %cmake . \
-%if %{with multi_user}
-       -DMULTI_USER_SUPPORT=On \
-%else
-       -DMULTI_USER_SUPPORT=Off \
-%endif
+-DTZ_SYS_USER_GROUP=%TZ_SYS_USER_GROUP \
+-DTZ_SYS_DEFAULT_USER=%TZ_SYS_DEFAULT_USER \
 %if %{with bluetooth_frwk_libnotify}
  -DLIBNOTIFY_SUPPORT=On \
 %else
@@ -108,25 +110,22 @@ make
 %install
 rm -rf %{buildroot}
 %make_install
-%if !%{with multi_user}
-       mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d/
-       mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d/
-       ln -s %{_sysconfdir}/rc.d/init.d/bluetooth-frwk-service %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S80bluetooth-frwk-service
-       ln -s %{_sysconfdir}/rc.d/init.d/bluetooth-frwk-service %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S80bluetooth-frwk-service
-%else
-       mv %{buildroot}%{_sysconfdir}/dbus-1/system.d/bluetooth-frwk-service_user.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/bluetooth-frwk-service.conf
-%endif
 
 mkdir -p %{buildroot}%{_unitdir_user}
 mkdir -p %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants
 install -m 0644 bt-service/bluetooth-frwk-service.service %{buildroot}%{_unitdir_user}
 ln -s ../bluetooth-frwk-service.service %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants/bluetooth-frwk-service.service
 
-%if %{with bluetooth_frwk_libnotify}
+%if %{with bluetooth_frwk_libnotify} || %{with bluetooth_frwk_libnotification}
 mkdir -p %{buildroot}%{_datadir}/icons/default
 install -m 0644 %{SOURCE1002} %{buildroot}%{_datadir}/icons/default/bt-icon.png
 %endif
 
+# On IVI bt-service needs to be run as 'app' even if there is a 'guest' user.
+%if "%{profile}"=="ivi"
+sed -i 's/%TZ_SYS_DEFAULT_USER/app/' %{buildroot}%{_datadir}/dbus-1/system-services/org.projectx.bt.service
+%endif
+
 %post
 /sbin/ldconfig
 vconftool set -tf int db/bluetooth/status "0" -g 6520
@@ -156,18 +155,14 @@ vconftool set -tf int memory/bluetooth/btsco "0" -g 6520 -i
 %files service
 %manifest %{name}.manifest
 %defattr(-, root, root)
-%if !%{with multi_user}
-       %{_datadir}/dbus-1/system-services/org.projectx.bt.service
-       %{_sysconfdir}/rc.d/init.d/bluetooth-frwk-service
-       %{_sysconfdir}/rc.d/rc3.d/S80bluetooth-frwk-service
-       %{_sysconfdir}/rc.d/rc5.d/S80bluetooth-frwk-service
-%endif
+%{_datadir}/dbus-1/system-services/org.projectx.bt.service
+
 %{_bindir}/bt-service
 %{_unitdir_user}/tizen-middleware.target.wants/bluetooth-frwk-service.service
 %{_unitdir_user}/bluetooth-frwk-service.service
 %attr(0666,-,-) /opt/var/lib/bluetooth/auto-pair-blacklist
 %{_sysconfdir}/dbus-1/system.d/bluetooth-frwk-service.conf
-%if %{with bluetooth_frwk_libnotify}
+%if %{with bluetooth_frwk_libnotify} || %{with bluetooth_frwk_libnotification}
 %{_datadir}/icons/default/bt-icon.png
 %endif