fix license path 60/118760/1
authorintae, jeon <intae.jeon@samsung.com>
Tue, 14 Mar 2017 03:58:45 +0000 (12:58 +0900)
committerintae, jeon <intae.jeon@samsung.com>
Tue, 14 Mar 2017 03:58:45 +0000 (12:58 +0900)
Change-Id: I66006801989abacb3aabf3945cd6324cf37b1e42
Signed-off-by: intae, jeon <intae.jeon@samsung.com>
CMakeLists.txt
packaging/email-service.spec

index c5af06b..7a0602c 100755 (executable)
@@ -56,7 +56,8 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/email-service.pc DESTINATION ${LIB_INSTALL_DIR
 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/email-service DESTINATION /etc/rc.d/init.d/)
 
 # LICENSE file
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license/email-service)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/licenses/email-service)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.BSD DESTINATION /usr/share/licenses/email-service)
 
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/ DESTINATION ${TZ_SYS_DATA}/email/res/image FILES_MATCHING PATTERN "*.png")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/ DESTINATION ${TZ_SYS_DATA}/email/res FILES_MATCHING PATTERN "*.sql")
index f805242..e9fa5a8 100755 (executable)
@@ -106,10 +106,10 @@ make %{?_smp_mflags}
 find -name '*.pc' -exec sed -i -e 's/\$version/%{version}/g' {} \;
 
 %install
-mkdir -p %{buildroot}/usr/share/license
-if [ -d %{_datarootdir}/license/email-service]; then
-       rm -rf %{_datarootdir}/license/email-service
-fi
+mkdir -p %{buildroot}/usr/share/licenses
+#if [ -d %{_datarootdir}/license/email-service]; then
+#      rm -rf %{_datarootdir}/license/email-service
+#fi
 
 # OS upgrade
 mkdir -p %{buildroot}%{upgrade_script_path}
@@ -167,7 +167,7 @@ systemctl daemon-reload
 %{_unitdir_user}/email-service.socket
 %{_unitdir_user}/sockets.target.wants/email-service.socket
 %{_datarootdir}/dbus-1/services/email-service.service
-%{_datarootdir}/license/email-service
+%{_datarootdir}/licenses/email-service
 %attr(0775,root,root) /etc/rc.d/init.d/email-service
 %{_bindir}/email-service_init_db.sh