Merge branch 'master' into tizen_2.1

Change-Id: Ib8474695633bdb45fb9648dc24f9178224bd54e7

diff --git a/bluetooth-tools.manifest b/bluetooth-tools.manifest
index 9500c80..e9e71d9 100644 (file)
--- a/bluetooth-tools.manifest
+++ b/bluetooth-tools.manifest
@@ -6,6 +6,8 @@
         <filesystem path="/etc/rc.d/init.d/bluetooth-address" label="_" exec_label="none"/>
         <filesystem path="/etc/rc.d/rc3.d/S60bluetooth-address" label="_" exec_label="none"/>
         <filesystem path="/etc/rc.d/rc5.d/S60bluetooth-address" label="_" exec_label="none"/>
+       <filesystem path="/usr/lib/systemd/system/bluetooth-address.service" label="_" exec_label="none" />
+       <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/bluetooth-address.service" label="_" exec_label="none" />
     </assign>
     <request>
         <domain name="bluetooth-tools"/>

diff --git a/packaging/bluetooth-tools.spec b/packaging/bluetooth-tools.spec
index 8f31541..6aebbae 100644 (file)
--- a/packaging/bluetooth-tools.spec
+++ b/packaging/bluetooth-tools.spec
@@ -1,7 +1,7 @@
 Name:       bluetooth-tools
 Summary:    bluetooth-tools
 Version:    0.2.35
-Release:    2
+Release:    3
 Group:      TO_BE/FILLED_IN
 License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -16,6 +16,9 @@ Tools fo bluetooth run/stop and set address
 %setup -q
 
 %build
+export CFLAGS+=" -fpie -fvisibility=hidden"
+export LDFLAGS+=" -Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie"
+
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 make %{?jobs:-j%jobs}