From d85b184aed7f172f6a885baefa7aef253c05d569 Mon Sep 17 00:00:00 2001 From: Hyunho Kang Date: Thu, 23 Mar 2017 10:45:19 +0900 Subject: [PATCH] Set license using %license Change-Id: I3345dce2d17af2758e37f790532eb448dfd9485f Signed-off-by: Hyunho Kang --- packaging/libscreen_connector.spec | 6 +++--- screen_connector_provider/CMakeLists.txt | 3 +-- screen_connector_watcher/CMakeLists.txt | 1 - screen_connector_watcher_evas/CMakeLists.txt | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packaging/libscreen_connector.spec b/packaging/libscreen_connector.spec index d9d69d0..9b9423e 100644 --- a/packaging/libscreen_connector.spec +++ b/packaging/libscreen_connector.spec @@ -70,7 +70,7 @@ Header & package configuration files to support development of the widget viewer %files -n %{name}_watcher %manifest %{name}_watcher.manifest %attr(0644,root,root) %{_libdir}/%{name}_watcher.so* -%{_datarootdir}/license/%{name}_watcher +%license LICENSE %files -n %{name}_watcher-devel %{_includedir}/screen_connector_watcher/*.h @@ -102,7 +102,7 @@ Header & package configuration files to support development of the widget viewer %files -n %{name}_provider %manifest %{name}_provider.manifest %attr(0644,root,root) %{_libdir}/%{name}_provider.so* -%{_datarootdir}/license/%{name}_provider +%license LICENSE %files -n %{name}_provider-devel %{_includedir}/screen_connector_provider/*.h @@ -134,7 +134,7 @@ Header & package configuration files to support development of the widget viewer %files -n %{name}_watcher_evas %manifest %{name}_watcher_evas.manifest %attr(0644,root,root) %{_libdir}/%{name}_watcher_evas.so* -%{_datarootdir}/license/%{name}_watcher_evas +%license LICENSE %files -n %{name}_watcher_evas-devel %{_includedir}/screen_connector_watcher_evas/*.h diff --git a/screen_connector_provider/CMakeLists.txt b/screen_connector_provider/CMakeLists.txt index d509838..2e5280c 100644 --- a/screen_connector_provider/CMakeLists.txt +++ b/screen_connector_provider/CMakeLists.txt @@ -43,5 +43,4 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME} INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h") -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "lib${PROJECT_NAME}") +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h") \ No newline at end of file diff --git a/screen_connector_watcher/CMakeLists.txt b/screen_connector_watcher/CMakeLists.txt index 56ac0a4..15fd826 100644 --- a/screen_connector_watcher/CMakeLists.txt +++ b/screen_connector_watcher/CMakeLists.txt @@ -44,4 +44,3 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME} INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h") -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "lib${PROJECT_NAME}") diff --git a/screen_connector_watcher_evas/CMakeLists.txt b/screen_connector_watcher_evas/CMakeLists.txt index bb8e182..7d34623 100644 --- a/screen_connector_watcher_evas/CMakeLists.txt +++ b/screen_connector_watcher_evas/CMakeLists.txt @@ -41,4 +41,3 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME} INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h") -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "lib${PROJECT_NAME}") -- 2.7.4