Fix x86_64 build-install compliance

Fix Librairies installation
Fix PC file
Fix Code issue : variable type

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index f0cf498..30369af 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -81,6 +81,12 @@ SET(EXPORT_HEADER
 #      include/
 )
 
+
+CONFIGURE_FILE(
+     ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_NAME}.pc.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_NAME}.pc
+    @ONLY
+)
 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})

diff --git a/client/ClientChannel.cpp b/client/ClientChannel.cpp
index fbff48c..cb69384 100644 (file)
--- a/client/ClientChannel.cpp
+++ b/client/ClientChannel.cpp
@@ -152,7 +152,6 @@ namespace smartcard_service_api
                        ErrorIllegalParameter &, ErrorSecurity &)
        {
                int rv = SCARD_ERROR_OK;
-
                if (getSession()->getReader()->isSecureElementPresent() == true)
                {
                        Message msg;

diff --git a/client/smartcard-service.pc b/client/smartcard-service.pc.in
similarity index 79%
rename from client/smartcard-service.pc
rename to client/smartcard-service.pc.in
index a58f2e7..eaa674a 100644 (file)
--- a/client/smartcard-service.pc
+++ b/client/smartcard-service.pc.in
@@ -3,11 +3,11 @@
 prefix=/usr
 exec_prefix=${prefix}/bin
 includedir=${prefix}/include
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 
 Name: smartcard-service
 Description: Make flags of Common library of Smartcard service
 Version: 1.0
 Requires: 
 Libs: -L${libdir} -lsmartcard-service
-Cflags: -I${includedir}/smartcard-service
\ No newline at end of file
+Cflags: -I${includedir}/smartcard-service

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index ddd165c..3894b38 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -69,6 +69,11 @@ SET(EXPORT_HEADER
        include/GPSEACL.h
 )
 
+CONFIGURE_FILE(
+     ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_NAME}.pc.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_NAME}.pc
+    @ONLY
+)
 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})

diff --git a/common/smartcard-service-common.pc b/common/smartcard-service-common.pc.in
similarity index 78%
rename from common/smartcard-service-common.pc
rename to common/smartcard-service-common.pc.in
index 36ea9c9..a051e12 100644 (file)
--- a/common/smartcard-service-common.pc
+++ b/common/smartcard-service-common.pc.in
@@ -3,11 +3,11 @@
 prefix=/usr
 exec_prefix=${prefix}/bin
 includedir=${prefix}/include
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 
 Name: smartcard-service-common
 Description: Make flags of Common library of Smartcard service
 Version: 1.0
 Requires: 
 Libs: -L${libdir} -lsmartcard-service-common
-Cflags: -I${includedir}/smartcard-service-common
\ No newline at end of file
+Cflags: -I${includedir}/smartcard-service-common

diff --git a/packaging/smartcard-service.spec b/packaging/smartcard-service.spec
index d26be1b..34a821a 100644 (file)
--- a/packaging/smartcard-service.spec
+++ b/packaging/smartcard-service.spec
@@ -5,9 +5,8 @@ Release:    1
 Group:      libs
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-#IFNDEF USE_AUTOSTART
 #Source1:    smartcard-service-server.init
-#ENDIF
+
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(security-server)
 BuildRequires: pkgconfig(dlog)
@@ -63,6 +62,7 @@ Requires:   %{name} = %{version}-%{release}
 %description -n smartcard-service-server
 smartcard service.
 
+
 %build
 mkdir obj-arm-limux-qnueabi
 cd obj-arm-limux-qnueabi
@@ -76,31 +76,22 @@ cd obj-arm-limux-qnueabi
 %install
 cd obj-arm-limux-qnueabi
 %make_install
-#IFNDEF USE_AUTOSTART
-#%__mkdir -p  %{buildroot}/etc/init.d/
-#%__mkdir -p  %{buildroot}/etc/rc.d/rc3.d/
-#%__mkdir -p  %{buildroot}/etc/rc.d/rc5.d/
-#%__cp -af %SOURCE1 %{buildroot}/etc/init.d/smartcard-service-server
-#chmod 755 %{buildroot}/etc/init.d/smartcard-service-server
-#ENDIF
-mkdir -p %{buildroot}/usr/share/license
-cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-service %{buildroot}/usr/share/license/
-cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-service-common %{buildroot}/usr/share/license/
-cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-service-server %{buildroot}/usr/share/license/
+%__mkdir -p  %{buildroot}/etc/init.d/
+%__mkdir -p  %{buildroot}/etc/rc.d/rc3.d/
+%__mkdir -p  %{buildroot}/etc/rc.d/rc5.d/
+%__cp -af %SOURCE1 %{buildroot}/etc/init.d/smartcard-service-server
+chmod 755 %{buildroot}/etc/init.d/smartcard-service-server
+
 
 %post
 /sbin/ldconfig
-#IFNDEF USE_AUTOSTART
-#ln -sf /etc/init.d/smartcard-service-server /etc/rc.d/rc3.d/S79smartcard-service-server
-#ln -sf /etc/init.d/smartcard-service-server /etc/rc.d/rc5.d/S79smartcard-service-server
-#ENDIF
+ln -sf /etc/init.d/smartcard-service-server /etc/rc.d/rc3.d/S79smartcard-service-server
+ln -sf /etc/init.d/smartcard-service-server /etc/rc.d/rc5.d/S79smartcard-service-server
 
 %postun
 /sbin/ldconfig
-#IFNDEF USE_AUTOSTART
-#rm -f /etc/rc.d/rc3.d/S79smartcard-service-server
-#rm -f /etc/rc.d/rc5.d/S79smartcard-service-server
-#ENDIF
+rm -f /etc/rc.d/rc3.d/S79smartcard-service-server
+rm -f /etc/rc.d/rc5.d/S79smartcard-service-server
 
 %files
 %manifest smartcard-service.manifest
@@ -139,3 +130,4 @@ cp -af %{_builddir}/%{name}-%{version}/packaging/smartcard-service-server %{buil
 /usr/share/dbus-1/services/org.tizen.smartcard_service.service
 #ENDIF
 /usr/share/license/smartcard-service-server
+

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index abcd35d..2b338c9 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -52,7 +52,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_server_LDFLAGS} "-L../common" "-lsmartcard-service-common" "-pie -ldl")
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_server_LDFLAGS} "-L../common" "-lsmartcard-service-common" "-ldl")
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 IF("${USE_AUTOSTART}" STREQUAL "1")

diff --git a/server/ServerDispatcher.cpp b/server/ServerDispatcher.cpp
index 0173bb9..c45e66c 100644 (file)
--- a/server/ServerDispatcher.cpp
+++ b/server/ServerDispatcher.cpp
@@ -103,7 +103,7 @@ namespace smartcard_service_api
                                        }
 
                                        /* create service */
-                                       if (resource->createService(socket, (unsigned int)msg->userParam) != NULL)
+                                       if (resource->createService(socket, (unsigned long)msg->userParam) != NULL)
                                        {
                                                response.error = SCARD_ERROR_OK;
 

diff --git a/test-client/CMakeLists.txt b/test-client/CMakeLists.txt
index ff3dfc1..6c6878f 100644 (file)
--- a/test-client/CMakeLists.txt
+++ b/test-client/CMakeLists.txt
@@ -44,5 +44,5 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DLOG_TAG=\"SMARTCARD_SERVICE_TEST\"")
 
 ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_test_client_LDFLAGS} "-L../common" "-lsmartcard-service-common" "-L../client" "-lsmartcard-service" "-pie -ldl")
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_test_client_LDFLAGS} "-L../common" "-lsmartcard-service-common" "-L../client" "-lsmartcard-service" "-ldl")
 #INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)