X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fbluetooth-frwk.spec;h=24801953dcbdba40a1fb3771512620858b71cdc2;hb=8f7482968bb63e7a3db02a19830557aa20af010f;hp=bb7a546d05714b24a70b479cb8eb955c0c279027;hpb=c1cf1095ba7489386b259a6d270496d84fc7c8cb;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec
index bb7a546..2480195 100644
--- a/packaging/bluetooth-frwk.spec
+++ b/packaging/bluetooth-frwk.spec
@@ -5,10 +5,11 @@
 %bcond_with x
 %define _dumpdir /opt/etc/dump.d/module.d
 %define _varlibdir /opt/var/lib
+%define _meshdir /opt/usr/mesh
 
 Name:       bluetooth-frwk
 Summary:    Bluetooth framework for BlueZ and Obexd. This package is Bluetooth framework based on BlueZ and Obexd stack.
-Version:    0.3.0
+Version:    0.6.0
 Release:    1
 Group:      Network & Connectivity/Bluetooth
 License:    Apache-2.0
@@ -19,8 +20,15 @@ Requires: bluetooth-tools
 
 %define bt_bluez_hal ENABLED
 %define bt_gatt_client_fd ENABLED
+%define bt_permanent_log DISABLED
+%define bt_http_proxy DISABLED
+%define bt_factory_mode DISABLED
+%define bt_vendor_operation DISABLED
 
 BuildRequires:  pkgconfig(aul)
+%if %{bt_factory_mode} == ENABLED
+BuildRequires:  pkgconfig(bincfg)
+%endif
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
@@ -32,16 +40,22 @@ BuildRequires:  pkgconfig(capi-network-connection)
 BuildRequires:  pkgconfig(alarm-service)
 BuildRequires:  pkgconfig(capi-content-mime-type)
 BuildRequires:  pkgconfig(eventsystem)
+%if %{bt_http_proxy} == ENABLED
 BuildRequires:	pkgconfig(libsoup-2.4)
+%endif
 BuildRequires:  pkgconfig(capi-network-tethering)
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(cynara-client)
 BuildRequires:  pkgconfig(cynara-creds-gdbus)
 BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(json-c)
+BuildRequires:  pkgconfig(ell)
 BuildRequires:  pkgconfig(storage)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(capi-appfw-app-control)
 BuildRequires:  pkgconfig(gmock)
+BuildRequires:  pkgconfig(libactd)
+BuildRequires:  pkgconfig(libsystemd-daemon)
 
 Requires(post): /usr/bin/vconftool
 Requires(post): /sbin/ldconfig
@@ -49,7 +63,7 @@ Requires(postun): /sbin/ldconfig
 
 %description
 Bluetooth framework for BlueZ and Obexd. This package is Bluetooth framework based on BlueZ and Obexd stack.
- This package contains API set for BT GAP, BT SDP, and BT RFCOMM.
+This package contains API set for BT GAP, BT SDP, BT RFCOMM and BLE Mesh.
 
 %package profile_common
 Summary:    bluetooth-frwk service and conf files for common profile
@@ -135,6 +149,7 @@ Requires:   %{name} = %{version}-%{release}
 %description service
 This package is Bluetooth Service daemon to manage BT services.
 
+%if %{bt_http_proxy} == ENABLED
 %package httpproxy
 Summary:    Bluetooth HTTP Proxy Service daemon
 Group:      Network & Connectivity/Bluetooth
@@ -142,6 +157,7 @@ Requires:   %{name} = %{version}-%{release}
 
 %description httpproxy
 This package is Bluetooth HTTP Proxy Service daemon
+%endif
 
 %package otp
 Summary:    Bluetooth OTP Service daemon
@@ -203,7 +219,6 @@ export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_PAN_NAP"
 export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_IPSP"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
-export CFLAGS="$CFLAGS -DTIZEN_GATT_CLIENT"
 
 %define _servicefile packaging/bluetooth-frwk-common.service
 %define _servicedir starter.target.wants
@@ -258,10 +273,20 @@ export LDFLAGS="$CFLAGS -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-
 export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_GATT_CLIENT_FD_DISABLE"
 %endif
 
-%ifarch %{ix86} x86_64
-export CFLAGS+=" -DTIZEN_TEST_EMUL"
-export CXXFLAGS+=" -DTIZEN_TEST_EMUL"
-export FFLAGS+=" -DTIZEN_TEST_EMUL"
+%if %{bt_permanent_log} == ENABLED
+export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_PERMANENT_LOG"
+%endif
+
+%if %{bt_http_proxy} == ENABLED
+export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_HTTP_PROXY"
+%endif
+
+%if %{bt_factory_mode} == ENABLED
+export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_FACTORY_MODE"
+%endif
+
+%if %{bt_vendor_operation} == ENABLED
+export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_VENDOR_OPERATION"
 %endif
 
 %if %{bt_bluez_hal} == ENABLED
@@ -278,9 +303,9 @@ export FFLAGS_DEFAULT="$FFLAGS"
 # extension-TM1
 %ifarch %{ix86} || %{arm}
 mkdir -p tm1
-export CFLAGS="$CFLAGS_DEFAULT -DTIZEN_FEATURE_RADIO -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
-export CXXFLAGS="$CXXFLAGS_DEFAULT -DTIZEN_FEATURE_RADIO -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
-export FFLAGS="$FFLAGS_DEFAULT -DTIZEN_FEATURE_RADIO -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
+export CFLAGS="$CFLAGS_DEFAULT -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
+export CXXFLAGS="$CXXFLAGS_DEFAULT -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
+export FFLAGS="$FFLAGS_DEFAULT -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
 
 cmake . -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_LIB_DIR=%{_libdir} \
@@ -288,7 +313,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr \
 -DTZ_SYS_DEFAULT_USER=%TZ_SYS_DEFAULT_USER \
 	-DLIBNOTIFY_SUPPORT=Off \
 	-DLIBNOTIFICATION_SUPPORT=Off
-make
+make %{?_smp_mflags}
 
 %cmake
 
@@ -298,9 +323,9 @@ cp %{buildroot}%{_bindir}/bt-core tm1/bt-core.tm1
 
 # extension-emulator
 %ifarch %{ix86} x86_64
-export CFLAGS="${CFLAGS} -DTIZEN_TEST_EMUL -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
-export CXXFLAGS="${CXXFLAGS} -DTIZEN_TEST_EMUL -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
-export FFLAGS="${FFLAGS} -DTIZEN_TEST_EMUL -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
+export CFLAGS="${CFLAGS} -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
+export CXXFLAGS="${CXXFLAGS} -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
+export FFLAGS="${FFLAGS} -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
 
 mkdir -p build_emulator
 
@@ -310,7 +335,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr \
 -DTZ_SYS_DEFAULT_USER=%TZ_SYS_DEFAULT_USER \
 	-DLIBNOTIFY_SUPPORT=Off \
 	-DLIBNOTIFICATION_SUPPORT=Off
-make
+make %{?_smp_mflags}
 
 %cmake
 
@@ -340,7 +365,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr \
 -DTZ_SYS_DEFAULT_USER=%TZ_SYS_DEFAULT_USER \
 	-DLIBNOTIFY_SUPPORT=Off \
 	-DLIBNOTIFICATION_SUPPORT=Off
-make
+make %{?_smp_mflags}
 
 %cmake
 
@@ -352,6 +377,7 @@ mkdir -p %{buildroot}%{_unitdir}/starter.target.wants
 mkdir -p %{buildroot}%{_unitdir}/delayed.target.wants
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 mkdir -p %{buildroot}/%{_prefix}/lib/udev/rules.d
+mkdir -p %{buildroot}%{_meshdir}
 
 cp packaging/99-bluetooth-rfkill.rules %{buildroot}/%{_prefix}/lib/udev/rules.d/99-bluetooth-rfkill.rules
 
@@ -389,15 +415,12 @@ install -m 0644 bt-core/bluetooth-frwk-core.service %{buildroot}%{_unitdir}/blue
 ln -s ../bluetooth-frwk.service %{buildroot}%{_unitdir}/multi-user.target.wants/bluetooth-frwk.service
 ln -s ../bluetooth-frwk.service %{buildroot}%{_unitdir}/starter.target.wants/bluetooth-frwk.service
 
-%post core
-mkdir -p %{_libdir}/systemd/system/delayed.target.wants
-ln -sf %{_libdir}/systemd/system/bluetooth-frwk-core.service %{_libdir}/systemd/system/delayed.target.wants/bluetooth-frwk-core.service
-
 %postun -p /sbin/ldconfig
 
 %post service
 /usr/bin/chsmack -a '_' %{_varlibdir}/bluetooth/auto-pair-blacklist
 /usr/bin/chown network_fw:network_fw %{_varlibdir}/bluetooth/auto-pair-blacklist
+/usr/bin/chown network_fw:network_fw %{_meshdir}
 
 %files
 %manifest %{name}.manifest
@@ -417,6 +440,7 @@ ln -sf %{_libdir}/systemd/system/bluetooth-frwk-core.service %{_libdir}/systemd/
 %{_includedir}/bt-service/bluetooth-ipsp-api.h
 %{_includedir}/bt-service/bluetooth-gatt-server-api.h
 %{_includedir}/bt-service/bluetooth-gatt-client-api.h
+%{_includedir}/bt-service/bluetooth-mesh-api.h
 %{_libdir}/pkgconfig/bluetooth-api.pc
 %{_libdir}/libbluetooth-api.so
 
@@ -446,8 +470,10 @@ popd
 %{_bindir}/bluetooth-frwk-test
 %{_varlibdir}/bluetooth
 %{_prefix}/etc/bluetooth
+%{_meshdir}
 %attr(-,network_fw,network_fw) %{_varlibdir}/bluetooth/auto-pair-blacklist
 
+%if %{bt_http_proxy} == ENABLED
 %files httpproxy
 %manifest %{name}.manifest
 %license LICENSE
@@ -455,7 +481,7 @@ popd
 %{_bindir}/bt-httpproxy
 %{_datadir}/dbus-1/system-services/org.projectx.httpproxy.service
 %{_sysconfdir}/dbus-1/system.d/bluetooth-frwk-httpproxy.conf
-
+%endif
 
 %files otp
 %manifest %{name}.manifest