Modify the upgrade script name

Change-Id: Ie6f552d7029931979dc854a018b7a03e557f2fb2
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/packaging/bluetoothd_upgrade.sh b/packaging/500.bluez_upgrade.sh
similarity index 100%
rename from packaging/bluetoothd_upgrade.sh
rename to packaging/500.bluez_upgrade.sh

diff --git a/packaging/bluez.spec b/packaging/bluez.spec
index adcb7ea..537067e 100644 (file)
--- a/packaging/bluez.spec
+++ b/packaging/bluez.spec
@@ -168,6 +168,7 @@ install -D -m 0644 src/main_w.conf %{buildroot}%{_sysconfdir}/bluetooth/main.con
 install -D -m 0644 src/main_m.conf %{buildroot}%{_sysconfdir}/bluetooth/main.conf
 %endif
 
+#install -D -m 0644 obexd/src/obex.service.in %{buildroot}%{_libdir}/systemd/system/obex.service
 
 #install -D -m 0644 src/bluetooth.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/bluetooth.conf
 #install -D -m 0644 profiles/audio/audio.conf %{buildroot}%{_sysconfdir}/bluetooth/audio.conf
@@ -199,9 +200,10 @@ ln -sf ../bluetooth-frwk.service %{buildroot}%{_libpath}/systemd/system/multi-us
 %endif
 
 mkdir -p %{buildroot}%{upgrade_script_path}
-cp -f packaging/bluetoothd_upgrade.sh %{buildroot}%{upgrade_script_path}
+cp -f packaging/500.bluez.sh %{buildroot}%{upgrade_script_path}
 
 %post -n libbluetooth -p /sbin/ldconfig
+ln -sf %{_libdir}/systemd/system/obex.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
 
 %postun -n libbluetooth -p /sbin/ldconfig
 
@@ -231,7 +233,7 @@ cp -f packaging/bluetoothd_upgrade.sh %{buildroot}%{upgrade_script_path}
 #%{_sbindir}/hid2hci
 %dir /usr/lib/udev
 /usr/lib/udev/*
-%{upgrade_script_path}/bluetoothd_upgrade.sh
+%{upgrade_script_path}/500.bluez.sh
 
 #test -2
 %if "%{?profile}" == "tv"
@@ -269,8 +271,8 @@ cp -f packaging/bluetoothd_upgrade.sh %{buildroot}%{upgrade_script_path}
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libexecdir}/bluetooth/obexd
-%{_libpath}/systemd/user/obex.service
-%{_datadir}/dbus-1/services/org.bluez.obex.service
+%{_libpath}/systemd/system/obex.service
+%{_datadir}/dbus-1/system-services/org.bluez.obex.service
 #%{_sysconfdir}/obex/root-setup.d/000_create-symlinks
 #%{_bindir}/obex-root-setup
 #%{_bindir}/obex.sh