Change some non-inclusive words

Change-Id: I06c475809ead89c6edb16ba42bc0d3d1fccdb4a6
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>

diff --git a/bt-service/CMakeLists.txt b/bt-service/CMakeLists.txt
index f5e6875..519a03b 100644 (file)
--- a/bt-service/CMakeLists.txt
+++ b/bt-service/CMakeLists.txt
@@ -162,7 +162,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${service_pkgs_LDFLAGS} bt-oal -ldl)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.projectx.bt.service DESTINATION share/dbus-1/system-services)
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/auto-pair-blacklist DESTINATION /opt/var/lib/bluetooth/)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/auto-pair-blocklist DESTINATION /opt/var/lib/bluetooth/)
 
 # install booting script
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-frwk-service.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/bluetooth-frwk-service.conf)

diff --git a/bt-service/auto-pair-blacklist b/bt-service/auto-pair-blocklist
similarity index 66%
rename from bt-service/auto-pair-blacklist
rename to bt-service/auto-pair-blocklist
index 9f15b76..07c1880 100644 (file)
--- a/bt-service/auto-pair-blacklist
+++ b/bt-service/auto-pair-blocklist
@@ -1,4 +1,4 @@
-AddressBlacklist=00:02:C7,00:16:FE,00:19:C1,00:1B:FB,00:1E:3D,00:21:4F,00:23:06,00:24:33,00:A0:79,00:0E:6D,00:13:E0,00:21:E8,00:60:57,00:0E:9F,00:12:1C,00:18:91,00:18:96,00:13:04,00:16:FD,00:22:A0,00:0B:4C,00:60:6F,00:23:3D,00:C0:59,00:0A:30,00:1E:AE,00:1C:D7,00:80:F0,00:12:8A,00:09:93,00:80:37,00:26:7E,00:1A:1B,00:14:9A,00:0B:24,08:76:95,00:14:09,00:1E:B2\r
-ExactNameBlacklist=Motorola IHF1000,i.TechBlueBAND,X5 Stereo v1.3,KML_CAN,SYNC,UConnect\r
-PartialNameBlacklist=BMW,Audi,Parrot,HandsFreeLink,Car,MB PhoneSystem,CAR MULTIMEDIA,MB Bluetooth,Pama\r
-KeyboardAutoPair=00:0F:F6\r
+AddressBlocklist=00:02:C7,00:16:FE,00:19:C1,00:1B:FB,00:1E:3D,00:21:4F,00:23:06,00:24:33,00:A0:79,00:0E:6D,00:13:E0,00:21:E8,00:60:57,00:0E:9F,00:12:1C,00:18:91,00:18:96,00:13:04,00:16:FD,00:22:A0,00:0B:4C,00:60:6F,00:23:3D,00:C0:59,00:0A:30,00:1E:AE,00:1C:D7,00:80:F0,00:12:8A,00:09:93,00:80:37,00:26:7E,00:1A:1B,00:14:9A,00:0B:24,08:76:95,00:14:09,00:1E:B2
+ExactNameBlocklist=Motorola IHF1000,i.TechBlueBAND,X5 Stereo v1.3,KML_CAN,SYNC,UConnect
+PartialNameBlocklist=BMW,Audi,Parrot,HandsFreeLink,Car,MB PhoneSystem,CAR MULTIMEDIA,MB Bluetooth,Pama
+KeyboardAutoPair=00:0F:F6

diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec
index e4a9f38..7266288 100644 (file)
--- a/packaging/bluetooth-frwk.spec
+++ b/packaging/bluetooth-frwk.spec
@@ -409,8 +409,8 @@ ln -s ../bluetooth-frwk.service %{buildroot}%{_unitdir}/starter.target.wants/blu
 %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/chsmack -a '_' %{_varlibdir}/bluetooth/auto-pair-blocklist
+/usr/bin/chown network_fw:network_fw %{_varlibdir}/bluetooth/auto-pair-blocklist
 /usr/bin/chown network_fw:network_fw %{_meshdir}
 
 %files
@@ -462,7 +462,7 @@ popd
 %{_varlibdir}/bluetooth
 %{_prefix}/etc/bluetooth
 %{_meshdir}
-%attr(-,network_fw,network_fw) %{_varlibdir}/bluetooth/auto-pair-blacklist
+%attr(-,network_fw,network_fw) %{_varlibdir}/bluetooth/auto-pair-blocklist
 
 %if %{bt_http_proxy} == ENABLED
 %files httpproxy