From 5b7b6c9dd84aa603cb84b644384d4da14bfb86c2 Mon Sep 17 00:00:00 2001 From: Suyeon Hwang Date: Wed, 12 Apr 2017 10:31:52 +0900 Subject: [PATCH] Use license macro in .spec file Change-Id: If22d6ceacdca15f9fdf433db1dcde6524117e825 Signed-off-by: Suyeon Hwang --- CMakeLists.txt | 2 -- packaging/tts.spec | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9f5eec..fe8da32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,8 +58,6 @@ ADD_SUBDIRECTORY(server) ## Engine Parser ## ADD_SUBDIRECTORY(engine-parser) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE RENAME tts DESTINATION ${TZ_SYS_RO_SHARE}/license) - ## Config ## INSTALL(FILES ${CMAKE_SOURCE_DIR}/tts-config.xml DESTINATION ${TZ_SYS_RO_SHARE}/voice/tts/1.0) diff --git a/packaging/tts.spec b/packaging/tts.spec index 0bded2e..1245d03 100644 --- a/packaging/tts.spec +++ b/packaging/tts.spec @@ -7,7 +7,7 @@ License: Apache-2.0 Source0: %{name}-%{version}.tar.gz Source1001: %{name}.manifest Source1002: %{name}-devel.manifest -Requires(post): /sbin/ldconfig +Requires(post): /sbin/ldconfig Requires(post): /usr/bin/buxton2ctl Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(aul) @@ -83,8 +83,6 @@ make %{?jobs:-j%jobs} %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{TZ_SYS_RO_SHARE}/license -install LICENSE %{buildroot}%{TZ_SYS_RO_SHARE}/license/%{name} %if "%{PRODUCT_TYPE}" == "TV" mv -f org.tizen.voice.ttsserver.tv.service org.tizen.voice.ttsserver.service @@ -106,6 +104,7 @@ mkdir -p %{TZ_SYS_RO_SHARE}/voice/test %files %manifest %{name}.manifest +%license LICENSE %defattr(-,root,root,-) %{_libdir}/lib*.so %{TZ_SYS_RO_SHARE}/upgrade/scripts/501.tts_upgrade_24to30.sh @@ -114,7 +113,6 @@ mkdir -p %{TZ_SYS_RO_SHARE}/voice/test %{TZ_SYS_RO_SHARE}/dbus-1/services/org.tizen.voice.ttsnotiserver.service %{TZ_SYS_RO_SHARE}/dbus-1/services/org.tizen.voice.ttssrserver.service #%{TZ_SYS_RO_SHARE}/voice/test/tts-test -%{TZ_SYS_RO_SHARE}/license/%{name} %{_bindir}/voice_getengine %{TZ_SYS_RO_ETC}/package-manager/parserlib/metadata/libtts-engine-parser.so* #%{TZ_SYS_RO_ETC}/package-manager/parserlib/metadata/libtts-engine-language-pack-parser.so* -- 2.7.4