Update boost libraries

Change-Id: I9e185c5c213a58a8297564194bef614903ab271d
Signed-off-by: sungrae jo <seongrae.jo@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66d66420a7c290c1246bcdc8a9d04fce18a22db5..a2ed2b2f364d50a82943ad1d23e7feb27337462d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,8 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libopus.so DESTINATION ${APP_INSTAL
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libopus.so.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libopus.so.0.6.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libboost_iostreams.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libboost_system.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libboost_thread.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/armv7l/org.tizen.stt-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
 ELSEIF("${ARCH}" MATCHES "^i586.*")
 #INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libn66asr.so DESTINATION ${TZ_SYS_RO_SHARE}/voice/stt/1.0/engine/ COMPONENT RuntimeLibraries)
@@ -29,6 +31,8 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libopus.so DESTINATION ${APP_INSTALL_
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libopus.so.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libopus.so.0.6.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_iostreams.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_system.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_thread.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/i586/org.tizen.stt-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
 ELSEIF("${ARCH}" MATCHES "^i686.*")
 #INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libn66asr.so DESTINATION ${TZ_SYS_RO_SHARE}/voice/stt/1.0/engine/ COMPONENT RuntimeLibraries)
@@ -42,6 +46,8 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libopus.so DESTINATION ${APP_INSTALL_
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libopus.so.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libopus.so.0.6.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_iostreams.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_system.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_thread.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/i586/org.tizen.stt-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
 ELSEIF("${ARCH}" MATCHES "^aarch64.*")
 #INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libn66asr.so DESTINATION ${TZ_SYS_RO_SHARE}/voice/stt/1.0/engine/ COMPONENT RuntimeLibraries)
@@ -55,6 +61,8 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libopus.so DESTINATION ${APP_INSTA
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libopus.so.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libopus.so.0.6.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libboost_iostreams.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libboost_system.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libboost_thread.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/aarch64/org.tizen.stt-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
 ELSEIF("${ARCH}" MATCHES "^x86_64.*")
 #INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libn66asr.so DESTINATION ${TZ_SYS_RO_SHARE}/voice/stt/1.0/engine/ COMPONENT RuntimeLibraries)
@@ -68,6 +76,8 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libopus.so DESTINATION ${APP_INSTAL
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libopus.so.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libopus.so.0.6.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libboost_iostreams.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libboost_system.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libboost_thread.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/x86_64/org.tizen.stt-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
 ENDIF()
 

diff --git a/bin/aarch64/org.tizen.stt-engine-default b/bin/aarch64/org.tizen.stt-engine-default
index 8cc4ebca3b47b67e03a1d8cac5918a3fbbc79cfb..5f251a93c3c8788d73cb9f320aae3e5fe59be860 100755 (executable)
Binary files a/bin/aarch64/org.tizen.stt-engine-default and b/bin/aarch64/org.tizen.stt-engine-default differ

diff --git a/bin/armv7l/org.tizen.stt-engine-default b/bin/armv7l/org.tizen.stt-engine-default
index 3d37ed80d0a89baaa85d4ab9dae749e11f5c2fae..2cd0a3cf58c8f2ac174f1d3892807873caac53e4 100755 (executable)
Binary files a/bin/armv7l/org.tizen.stt-engine-default and b/bin/armv7l/org.tizen.stt-engine-default differ

diff --git a/bin/i586/org.tizen.stt-engine-default b/bin/i586/org.tizen.stt-engine-default
index 99ab60619520165f36727988155dfe69be5f75cf..34931002090b5b6cb3169494068a26c2b0582c8a 100755 (executable)
Binary files a/bin/i586/org.tizen.stt-engine-default and b/bin/i586/org.tizen.stt-engine-default differ

diff --git a/bin/x86_64/org.tizen.stt-engine-default b/bin/x86_64/org.tizen.stt-engine-default
index fd8824595ac15993d3527da97b6e638bcfb7f07f..6a5323dccac5fa31458c86d25e301eaca79ed2b6 100755 (executable)
Binary files a/bin/x86_64/org.tizen.stt-engine-default and b/bin/x86_64/org.tizen.stt-engine-default differ

diff --git a/lib/aarch64/libboost_iostreams.so b/lib/aarch64/libboost_iostreams.so
old mode 100644 (file)
new mode 100755 (executable)
index 4378c64..7f7ac57
Binary files a/lib/aarch64/libboost_iostreams.so and b/lib/aarch64/libboost_iostreams.so differ

diff --git a/lib/aarch64/libboost_system.so b/lib/aarch64/libboost_system.so
new file mode 100755 (executable)
index 0000000..78105b6
Binary files /dev/null and b/lib/aarch64/libboost_system.so differ

diff --git a/lib/aarch64/libboost_thread.so b/lib/aarch64/libboost_thread.so
new file mode 100755 (executable)
index 0000000..d34dcc9
Binary files /dev/null and b/lib/aarch64/libboost_thread.so differ

diff --git a/lib/armv7l/libboost_iostreams.so b/lib/armv7l/libboost_iostreams.so
old mode 100644 (file)
new mode 100755 (executable)
index b87cc02..0719947
Binary files a/lib/armv7l/libboost_iostreams.so and b/lib/armv7l/libboost_iostreams.so differ

diff --git a/lib/armv7l/libboost_system.so b/lib/armv7l/libboost_system.so
new file mode 100755 (executable)
index 0000000..fb0adf3
Binary files /dev/null and b/lib/armv7l/libboost_system.so differ

diff --git a/lib/armv7l/libboost_thread.so b/lib/armv7l/libboost_thread.so
new file mode 100755 (executable)
index 0000000..2613847
Binary files /dev/null and b/lib/armv7l/libboost_thread.so differ

diff --git a/lib/i586/libboost_iostreams.so b/lib/i586/libboost_iostreams.so
old mode 100644 (file)
new mode 100755 (executable)
index 2da0ba0..5a11329
Binary files a/lib/i586/libboost_iostreams.so and b/lib/i586/libboost_iostreams.so differ

diff --git a/lib/i586/libboost_system.so b/lib/i586/libboost_system.so
new file mode 100755 (executable)
index 0000000..4dc7e87
Binary files /dev/null and b/lib/i586/libboost_system.so differ

diff --git a/lib/i586/libboost_thread.so b/lib/i586/libboost_thread.so
new file mode 100755 (executable)
index 0000000..01ee08d
Binary files /dev/null and b/lib/i586/libboost_thread.so differ

diff --git a/lib/x86_64/libboost_iostreams.so b/lib/x86_64/libboost_iostreams.so
old mode 100644 (file)
new mode 100755 (executable)
index dc5e357..1c6026d
Binary files a/lib/x86_64/libboost_iostreams.so and b/lib/x86_64/libboost_iostreams.so differ

diff --git a/lib/x86_64/libboost_system.so b/lib/x86_64/libboost_system.so
new file mode 100755 (executable)
index 0000000..bc1ae2c
Binary files /dev/null and b/lib/x86_64/libboost_system.so differ

diff --git a/lib/x86_64/libboost_thread.so b/lib/x86_64/libboost_thread.so
new file mode 100755 (executable)
index 0000000..b607ee7
Binary files /dev/null and b/lib/x86_64/libboost_thread.so differ

diff --git a/packaging/org.tizen.stt-engine-default.spec b/packaging/org.tizen.stt-engine-default.spec
index c0525679e35d9df3164da87726ad4c8824818b0a..913f50039cd3f982a55e76f4e25dc308fa0f08f1 100644 (file)
--- a/packaging/org.tizen.stt-engine-default.spec
+++ b/packaging/org.tizen.stt-engine-default.spec
@@ -16,6 +16,11 @@ Requires(postun): /sbin/ldconfig
 BuildRequires: cmake
 BuildRequires: pkgconfig(libtzplatform-config)
 
+# Exclude boost requires/provides
+%global _privatelibs libboost_iostreams.so|libboost_system.so|libboost_thread.so
+%global __provides_exclude %{_privatelibs}
+%global __requires_exclude %{_privatelibs}
+
 %description
 Description: Speech To Text default engine library
 
@@ -65,6 +70,10 @@ rm -rf %{buildroot}
 %post
 mv %{APP_PREFIX}/lib/libboost_iostreams.so %{APP_PREFIX}/lib/libboost_iostreams.so.1.58.0
 ln -s %{APP_PREFIX}/lib/libboost_iostreams.so.1.58.0 %{APP_PREFIX}/lib/libboost_iostreams.so
+mv %{APP_PREFIX}/lib/libboost_system.so %{APP_PREFIX}/lib/libboost_system.so.1.58.0
+ln -s %{APP_PREFIX}/lib/libboost_system.so.1.58.0 %{APP_PREFIX}/lib/libboost_system.so
+mv %{APP_PREFIX}/lib/libboost_thread.so %{APP_PREFIX}/lib/libboost_thread.so.1.58.0
+ln -s %{APP_PREFIX}/lib/libboost_thread.so.1.58.0 %{APP_PREFIX}/lib/libboost_thread.so
 
 /sbin/ldconfig
 exit 0