From b29d60594b312e3bdb3897e379cd512341595d92 Mon Sep 17 00:00:00 2001 From: Jinkun Jang Date: Sat, 16 Mar 2013 01:13:07 +0900 Subject: [PATCH] merge with master --- bt-service/bluetooth-frwk-service.service | 3 ++- packaging/bluetooth-frwk.spec | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bt-service/bluetooth-frwk-service.service b/bt-service/bluetooth-frwk-service.service index 8a493cc..36fce3d 100644 --- a/bt-service/bluetooth-frwk-service.service +++ b/bt-service/bluetooth-frwk-service.service @@ -2,6 +2,7 @@ [Unit] Description=Bluetooth Framework Service +After=dbus.service [Service] Type=dbus @@ -11,4 +12,4 @@ ExecStart=/usr/bin/bt-service RemainAfterExit=yes [Install] -WantedBy=bluetooth.target +WantedBy=tizen-middleware.target.wants diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec index e71d816..4f50161 100644 --- a/packaging/bluetooth-frwk.spec +++ b/packaging/bluetooth-frwk.spec @@ -73,9 +73,10 @@ 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 -mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants -install -m 0644 bt-service/bluetooth-frwk-service.service %{buildroot}%{_libdir}/systemd/system/ -ln -s ../bluetooth-frwk-service.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/bluetooth-frwk-service.service +mkdir -p %{buildroot}%{_libdir}/systemd/user +mkdir -p %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants +install -m 0644 bt-service/bluetooth-frwk-service.service %{buildroot}%{_libdir}/systemd/user/ +ln -s ../bluetooth-frwk-service.service %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants/bluetooth-frwk-service.service %post @@ -108,8 +109,8 @@ vconftool set -tf int memory/bluetooth/btsco "0" -g 6520 -i %{_sysconfdir}/rc.d/rc5.d/S80bluetooth-frwk-service %{_datadir}/dbus-1/services/org.projectx.bt.service %{_bindir}/bt-service -%{_libdir}/systemd/system/multi-user.target.wants/bluetooth-frwk-service.service -%{_libdir}/systemd/system/bluetooth-frwk-service.service +%{_libdir}/systemd/user/tizen-middleware.target.wants/bluetooth-frwk-service.service +%{_libdir}/systemd/user/bluetooth-frwk-service.service %attr(0666,-,-) /opt/var/lib/bluetooth/auto-pair-blacklist %files core -- 2.7.4