From fc0fed4d29dcb418e85a0534fb145af16a94ab1e Mon Sep 17 00:00:00 2001
From: Rusty Lynch <rusty.lynch@intel.com>
Date: Wed, 23 Oct 2013 11:24:40 -0700
Subject: [PATCH] Reland fixes to spec that were clobbered by recent downgrade

Change-Id: I043697347eb5a908ffa44488a8bc7a1c84bf5ba5
---
 packaging/bluetooth-frwk.spec | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec
index f6db6f0..c84ab48 100644
--- a/packaging/bluetooth-frwk.spec
+++ b/packaging/bluetooth-frwk.spec
@@ -3,14 +3,15 @@
 %bcond_with multi_user
 
 Name:       bluetooth-frwk
-Summary:    Bluetooth framework for BlueZ and Obexd.
+Summary:    Bluetooth framework for BlueZ and Obexd
 Version:    0.2.55
 Release:    2
-Group:      connectivity/bluetooth-frwk
-License:    Apache License, Version 2.0
+Group:      Network & Connectivity/Bluetooth
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001:    bluetooth-frwk.manifest
-Source1002:	bt-icon.png
+Source1001: bluetooth-frwk.manifest
+Source1002: bt-icon.png
+URL:        https://review.tizen.org/git/?p=platform/core/connectivity/bluetooth-frwk.git;a=summary
 Requires: dbus
 Requires: syspopup
 Requires: bluetooth-tools
@@ -38,9 +39,11 @@ BuildRequires:  pkgconfig(security-server)
 BuildRequires:  cmake
 
 Requires(post): vconf
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
-Bluetooth framework for BlueZ and Obexd.
+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.
 
 
@@ -55,7 +58,7 @@ This package contains API set for BT GAP, BT SDP, and BT RFCOMM.
 
 %package service
 Summary:    Bluetooth Service daemon
-Group:      connectivity/bluetooth-frwk
+Group:      Network & Connectivity/Bluetooth
 Requires:   %{name} = %{version}-%{release}
 
 %description service
@@ -63,7 +66,7 @@ This package is Bluetooth Service daemon to manage BT services.
 
 %package core
 Summary:    Bluetooth Core daemon
-Group:      connectivity/bluetooth-frwk
+Group:      Network & Connectivity/Bluetooth
 Requires:   %{name} = %{version}-%{release}
 
 %description core
@@ -75,10 +78,15 @@ cp %{SOURCE1001} .
 
 
 %build
-export CFLAGS+=" -fpie"
-export LDFLAGS+=" -Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie"
 
-cmake . -DCMAKE_INSTALL_PREFIX=/usr  \
+%ifarch x86_64
+export CFLAGS+="   -Wall -g -fvisibility=hidden -fPIC"
+export LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs" 
+%else
+export CFLAGS+=" -fpie"
+export LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs -pie"
+%endif
+%cmake . \
 %if %{with multi_user}
 	-DMULTI_USER_SUPPORT=On \
 %else
@@ -119,7 +127,8 @@ mkdir -p %{buildroot}%{_datadir}/icons/default
 install -m 0644 %{SOURCE1002} %{buildroot}%{_datadir}/icons/default/bt-icon.png
 %endif
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
 vconftool set -tf int db/bluetooth/status "0" -g 6520
 vconftool set -tf int file/private/bt-service/flight_mode_deactivated "0" -g 6520 -i
 vconftool set -tf string memory/bluetooth/sco_headset_name "" -g 6520 -i
-- 
2.7.4