Fix spec file

Change-Id: Ia131d6a436bfacfe3ba585f80359840716bda0f4
Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef4ef014f9a9f70b8ff5b5933b539fb08004cc8a..dc8d3fdeb9626284aff0800d300842fb7182a4b4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,8 +38,8 @@ ENDFOREACH(flag)
 SET(COMMON_LIBS multi-wakeup-recognizer boost_iostream n66asrdll opus speex voiceactivity voice-transport)
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -fPIC -fPIE -std=gnu++0x -mthumb -Wa,-mimplicit-it=thumb -fvisibility=hidden -fvisibility-inlines-hidden")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -fPIE -fvisibility=hidden")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -fPIE -std=gnu++0x -mthumb -Wa,-mimplicit-it=thumb -fvisibility=hidden -fvisibility-inlines-hidden")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIE -fvisibility=hidden")
 
 # SET WARNNING OPTION ----------------------------------------------------------------------------
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
@@ -56,8 +56,6 @@ ELSE()
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}")
 ENDIF()
 
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
-
 LINK_DIRECTORIES(${CMAKE_SOURCE_DIR}/lib)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/inc)

diff --git a/packaging/org.tizen.multi-assistant-service.spec b/packaging/org.tizen.multi-assistant-service.spec
index 2ed3bd97d1abe37041fbcb8638111b3bd2b4ae80..5b617aa75bc612e5586ba5ad2f6f6101e10c8b0d 100644 (file)
--- a/packaging/org.tizen.multi-assistant-service.spec
+++ b/packaging/org.tizen.multi-assistant-service.spec
@@ -1,13 +1,14 @@
-Name: org.tizen.multi-assistant-service
-Summary: Multi assistant service
-Version: 0.0.1
-Release: 1
-Group: Applications
-License: Flora-1.1
-URL: TO_BE_FIELD
-Source0: %{name}-%{version}.tar.gz
+Name:          org.tizen.multi-assistant-service
+Summary:       Multi assistant service
+Version:       0.0.1
+Release:       1
+Group:         Graphics & UI Framework/Voice Framework
+License:       Flora-1.1
+Source:                %{name}-%{version}.tar.gz
+Source1001:    %{name}.manifest
 
-#ExclusiveArch: %arm
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 BuildRequires: pkgconfig(capi-appfw-application)
 BuildRequires: pkgconfig(capi-appfw-app-manager)
@@ -36,6 +37,7 @@ org.tizen.multi-assistant-service (application)
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 LDFLAGS="$LDFLAGS -Wl,-z -Wl,nodelete"
@@ -53,6 +55,8 @@ make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
+mkdir -p %{buildroot}%{TZ_SYS_RO_SHARE}/license
+cp LICENSE.Flora %{buildroot}%{TZ_SYS_RO_SHARE}/license/%{name}
 
 %make_install
 %define tizen_sign 1
@@ -66,17 +70,24 @@ mkdir -p %{_bindir}
 #/usr/bin/signing-client/hash-signer-client.sh -a -d -p platform /usr/apps/org.tizen.multi-assistant-service
 mv %{_appdir}/lib/libboost_iostreams.so %{_appdir}/lib/libboost_iostreams.so.1.58.0
 ln -s %{_appdir}/lib/libboost_iostreams.so.1.58.0 %{_appdir}/lib/libboost_iostreams.so
-tpk-backend --preload -y org.tizen.multi-assistant-service
+
+/sbin/ldconfig
+exit 0
+
+%postun
+/sbin/ldconfig
+exit 0
 
 # INITIALIZE VCONF ------------------------------------------------------------
 
 %files
-%manifest org.tizen.multi-assistant-service.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 /usr/share/license/*
 /usr/share/packages/org.tizen.multi-assistant-service.xml
 %{_appdir}/author-signature.xml
 %{_appdir}/signature1.xml
 %{_appdir}/lib/*
-%defattr(-,app,app,-)
-%{_bindir}/org.tizen.multi-assistant-service
+%{_appdir}/bin/*
+#%defattr(-,app,app,-)
+#%{_bindir}/org.tizen.multi-assistant-service