Add missing runtime requires. Fix build on x86_64.

Change-Id: I464d05b0fcd567e27983cf4d8c0e2e0e34077341

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index b766051471a20b411021482d7afb220789871158..d1800fe183be56d77656ba0ef8915819a5a84825 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -81,8 +81,8 @@ SET(EXPORT_HEADER
 #      include/
 )
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_NAME}.pc DESTINATION lib/pkgconfig)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
 FOREACH(hfile ${EXPORT_HEADER})
         INSTALL(FILES ${hfile} DESTINATION include/${LIB_NAME})
 ENDFOREACH(hfile)

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 7b28e5cf79981d6ab741e62d1f8305814da2d206..13a5b61070fd64baf66217e32949e05dd77a1053 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -69,8 +69,8 @@ SET(EXPORT_HEADER
        include/GPSEACL.h
 )
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_NAME}.pc DESTINATION lib/pkgconfig)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
 FOREACH(hfile ${EXPORT_HEADER})
         INSTALL(FILES ${hfile} DESTINATION include/${LIB_NAME})
 ENDFOREACH(hfile)

diff --git a/packaging/smartcard-service.spec b/packaging/smartcard-service.spec
index 2a49cde5cbb60e13736bc187d5c6db4f9b071604..9373629dea5434b6680dfe7a1503842c73557928 100644 (file)
--- a/packaging/smartcard-service.spec
+++ b/packaging/smartcard-service.spec
@@ -3,7 +3,7 @@ Summary:    Smartcard Service FW
 Version:    0.1.15
 Release:    0
 Group:      libs
-License:    Apache License, Version 2.0
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 #IFNDEF USE_AUTOSTART
 #Source1:    smartcard-service-server.init
@@ -50,6 +50,7 @@ common smartcard service.
 Summary:    common smartcard service
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
+Requires:   smartcard-service-common = %{version}-%{release}
 
 %description -n smartcard-service-common-devel
 common smartcard service.
@@ -68,7 +69,7 @@ cd obj-arm-limux-qnueabi
 #IFNDEF USE_AUTOSTART
 #cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix}
 #ELSE
-cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DUSE_AUTOSTART=1 # daemon will be started when client makes instance by DBUS
+%cmake .. -DUSE_AUTOSTART=1 # daemon will be started when client makes instance by DBUS
 #ENDIF
 #make %{?jobs:-j%jobs}
 
@@ -104,33 +105,33 @@ cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-service-server %{buil
 %files
 %manifest smartcard-service.manifest
 %defattr(-,root,root,-)
-/usr/lib/libsmartcard-service.so.*
+%{_libdir}/libsmartcard-service.so.*
 /usr/share/license/smartcard-service
 
 %files  devel
 %manifest smartcard-service-devel.manifest
 %defattr(-,root,root,-)
-/usr/include/smartcard-service/*
-/usr/lib/libsmartcard-service.so
-/usr/lib/pkgconfig/smartcard-service.pc
+%{_includedir}/smartcard-service/*
+%{_libdir}/libsmartcard-service.so
+%{_libdir}/pkgconfig/smartcard-service.pc
 
 %files -n smartcard-service-common
 %manifest smartcard-service-common.manifest
 %defattr(-,root,root,-)
-/usr/lib/libsmartcard-service-common.so.*
+%{_libdir}/libsmartcard-service-common.so.*
 /usr/share/license/smartcard-service-common
 
 %files -n smartcard-service-common-devel
 %manifest smartcard-service-common-devel.manifest
 %defattr(-,root,root,-)
-/usr/include/smartcard-service-common/*
-/usr/lib/libsmartcard-service-common.so
-/usr/lib/pkgconfig/smartcard-service-common.pc
+%{_includedir}/smartcard-service-common/*
+%{_libdir}/libsmartcard-service-common.so
+%{_libdir}/pkgconfig/smartcard-service-common.pc
 
 %files -n smartcard-service-server
 %manifest smartcard-service-server.manifest
 %defattr(-,root,root,-)
-/usr/bin/smartcard-daemon
+%{_bindir}/smartcard-daemon
 #/usr/bin/smartcard-test-client
 #IFNDEF USE_AUTOSTART
 #/etc/init.d/smartcard-service-server