Multi-user compliancesubmit/tizen_ivi_release/20140312.071215submit/tizen/20140312.070737submit/tizen/20140219.054210accepted/tizen/mobile/20140227.071214accepted/tizen/ivi/release/20140312.114446accepted/tizen/ivi/panda/20140312.110953accepted/tizen/ivi/20140219.200046accepted/tizen/generic/20140312.100305accepted/tizen/generic/20140219.071851tizen_ivi_releaseaccepted/tizen_ivi_releaseaccepted/tizen/iviaccepted/tizen/generic

Also update Group Tags and clean spec file.

Bug-Tizen: PTREL-391
Change-Id: Ibe889ab85cde4ecd3be7bb11f348d84df0b8ad81
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

2 files changed, 19 insertions, 20 deletions

diff --git a/obexd/src/obex.service.in b/obexd/src/obex.service.in
index a44bb894..718ce747 100644
--- a/obexd/src/obex.service.in
+++ b/obexd/src/obex.service.in
@@ -4,7 +4,7 @@ Description=Bluetooth OBEX service
 [Service]
 Type=dbus
 BusName=org.bluez.obex
-ExecStart=/bin/sh -c 'if [ -z `ps ax | grep -v grep | grep obexd` ] ; then exec @libexecdir@/obexd -d --noplugin=syncevolution,pcsuite,irmc --symlinks -r /opt/usr/media; fi'
+ExecStart=/bin/sh -c 'if [ -z `ps ax | grep -v grep | grep obexd` ] ; then eval $(tzplatform-get TZ_USER_CONTENT); exec @libexecdir@/obexd -d --noplugin=syncevolution,pcsuite,irmc --symlinks -r $TZ_USER_CONTENT; fi'
 
 [Install]
 Alias=dbus-org.bluez.obex.service
diff --git a/packaging/bluez.spec b/packaging/bluez.spec
index 893dbbfa..f0f7d888 100644
--- a/packaging/bluez.spec
+++ b/packaging/bluez.spec
@@ -24,16 +24,16 @@ Version:        5.12
 Release:        0
 Summary:        Bluetooth Stack for Linux
 License:        GPL-2.0+
-Group:          Connectivity/Bluetooth
+Group:          Network & Connectivity/Bluetooth
 Source:         bluez-%{version}.tar.gz
 Source2:        bluez-coldplug.init
 Source3:        bluetooth.sysconfig
 Source4:        bluetooth.sh
 Source5:        baselibs.conf
 Source7:        bluetooth.modprobe
-Source101:	obex-root-setup
-Source102:	create-symlinks
-Source1001: 	bluez.manifest
+Source101:      obex-root-setup
+Source102:      create-symlinks
+Source1001:     bluez.manifest
 
 %define cups_lib_dir %{_prefix}/lib/cups
 
@@ -53,7 +53,7 @@ stack.
 %package -n libbluetooth
 Summary:        Bluetooth Libraries
 License:        GPL-2.0+
-Group:          Connectivity/Bluetooth
+Group:          Network & Connectivity/Bluetooth
 
 %description -n libbluetooth
 Bluetooth protocol stack libraries.
@@ -61,7 +61,7 @@ Bluetooth protocol stack libraries.
 %package cups
 Summary:        CUPS Driver for Bluetooth Printers
 License:        GPL-2.0+
-Group:          Connectivity/Bluetooth
+Group:          Network & Connectivity/Bluetooth
 Requires:       libbluetooth = %{version}
 
 %description cups
@@ -69,15 +69,16 @@ Contains the files required by CUPS for printing to Bluetooth-connected
 printers.
 
 %package -n obexd
-Summary: OBEX Server A basic OBEX server implementation
-Group: Applications/System
+Summary:        OBEX Server A basic OBEX server implementation
+Group:          Network & Connectivity/Bluetooth
+Requires:       tizen-platform-config-tools
 
 %description -n obexd
 OBEX Server A basic OBEX server implementation.
 
 %package test
 Summary:        Tools for testing of various Bluetooth-functions
-License:        GPL-2.0+ ; MIT
+License:        GPL-2.0+ and MIT
 Group:          Development/Tools
 Requires:       dbus-python
 Requires:       libbluetooth = %{version}
@@ -96,14 +97,14 @@ autoreconf -fiv
 
 export CFLAGS="${CFLAGS} -D__TIZEN_PATCH__"
 %configure  --with-pic \
-			--libexecdir=/lib \
-			--disable-usb	\
-			--enable-test	\
-			--enable-library	\
-			--enable-experimental	\
-			--enable-readline	\
-			--with-systemdunitdir=%{_unitdir}	\
-			%{?with_libcapng}
+            --libexecdir=/lib \
+            --disable-usb	\
+            --enable-test	\
+            --enable-library	\
+            --enable-experimental	\
+            --enable-readline	\
+            --with-systemdunitdir=%{_unitdir}	\
+            %{?with_libcapng}
 make %{?_smp_mflags} all V=1
 
 %check
@@ -124,7 +125,6 @@ fi
 # no idea why this is suddenly necessary...
 install --mode 0755 -d $RPM_BUILD_ROOT/var/lib/bluetooth
 
-
 install -D -m 0755 %SOURCE101 %{buildroot}%{_bindir}/obex-root-setup
 install -D -m 0755 %SOURCE102 %{buildroot}%{_sysconfdir}/obex/root-setup.d/000_create-symlinks
 install -D -m 0755 tools/btiotest $RPM_BUILD_ROOT/%{_bindir}/
@@ -135,7 +135,6 @@ install -D -m 0755 tools/scotest $RPM_BUILD_ROOT/%{_bindir}/
 
 install -D -m 0755 tools/obexctl %{buildroot}%{_bindir}/obexctl
 
-
 %post -n libbluetooth -p /sbin/ldconfig
 
 %postun -n libbluetooth -p /sbin/ldconfig