From 30fe21916d90edcbdc37ad9d3e42903f49a17f13 Mon Sep 17 00:00:00 2001 From: Kichan Kwon Date: Tue, 17 Sep 2019 10:15:37 +0900 Subject: [PATCH] Fix devel package - Move header to the /usr/include/system - Include the symbolic link of library Change-Id: I489b776a9966cb3a8a542097145a23d15c9bee4d Signed-off-by: Kichan Kwon --- CMakeLists.txt | 2 +- capi-system-battery-monitor.pc.in | 2 +- packaging/capi-system-battery-monitor.spec | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4302eb..2c15b5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ SET_TARGET_PROPERTIES(${LIB_NAME} INSTALL(TARGETS ${LIB_NAME} DESTINATION ${LIB_DIR}) INSTALL( - DIRECTORY ${INC_DIR}/ DESTINATION ${LIB_INCLUDE_DIR} + DIRECTORY ${INC_DIR}/ DESTINATION ${LIB_INCLUDE_DIR}/system FILES_MATCHING PATTERN "${INC_DIR}/battery_monitor.h" ) diff --git a/capi-system-battery-monitor.pc.in b/capi-system-battery-monitor.pc.in index 328ec23..cefb0bb 100644 --- a/capi-system-battery-monitor.pc.in +++ b/capi-system-battery-monitor.pc.in @@ -3,7 +3,7 @@ prefix=@PREFIX@ exec_prefix=/usr libdir=@LIB_INSTALL_DIR@ -includedir=@INCLUDE_INSTALL_DIR@ +includedir=@INCLUDE_INSTALL_DIR@/system Name: @PC_NAME@ Description: @PACKAGE_DESCRIPTION@ diff --git a/packaging/capi-system-battery-monitor.spec b/packaging/capi-system-battery-monitor.spec index 1f9666e..a012f68 100644 --- a/packaging/capi-system-battery-monitor.spec +++ b/packaging/capi-system-battery-monitor.spec @@ -65,10 +65,9 @@ make %{?jobs:-j%jobs} %attr(644,-,-) %{_libdir}/lib%{name}.so.* %files devel -%manifest %{name}-devel.manifest -%defattr(-,root,root,-) +%{_libdir}/lib*.so %{_libdir}/pkgconfig/%{name}.pc -%{_includedir}/* +%{_includedir}/system/*.h %files test %manifest %{name}.manifest -- 2.34.1