[Tizen-submit] 6326: Changes to Tizen/libcryptsvc

noreply at tizen.org noreply at tizen.org
Wed May 29 15:37:22 GMT 2013


Hi,
Xavier Roche have made the following changes to libcryptsvc in project Tizen. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #6326

  submit:       Tizen:build/libcryptsvc(cleanup) -> Tizen


Message:
Submitter: Xavier Roche <xavrock.os at gmail.com>
Comments: Fix hardcoded library path for 64b compatibility
Git project: platform/core/security/libcryptsvc
Tag: submit/tizen/20130529.151212
Commit: 0e97bcc Changes : Fix hardcoded library path for 64b compatibility

State:   new        2013-05-29T08:36:47 tizenrobot
Comment: <no comment>
changes files:
--------------
--- libcryptsvc.changes
+++ libcryptsvc.changes
@@ -0,0 +1,3 @@
+* Wed May 29 2013 Xavier Roche <xavrock.os at gmail.com> accepted/tizen/20130520.103533 at 7632f8e
+- Fix hardcoded library path for 64b compatibility
+

spec files:
-----------
--- libcryptsvc.spec
+++ libcryptsvc.spec
@@ -2,7 +2,7 @@
 Summary:   nothing
 Version:    0.0.1
 Release:    6
-VCS:        platform/core/security/libcryptsvc#submit/tizen/20130518.045619-0-g7146d36
+VCS:        platform/core/security/libcryptsvc#submit/tizen/20130529.151212-0-g0e97bcccb233bfdd95eae8ed69074c17329e4fe5
 Group:      Osp/Security
 License:    APLv2
 Source0:    %{name}-%{version}.tar.gz
@@ -25,10 +25,10 @@
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%ifarch %{ix86}
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCH=x86 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DDESCRIPTION=%{summary}
+%ifarch %ix86 x86_64
+%cmake . -DARCH=x86 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DDESCRIPTION=%{summary}
 %else
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCH=arm -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DDESCRIPTION=%{summary}
+%cmake . -DARCH=arm -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DDESCRIPTION=%{summary}
 %endif
 make %{?jobs:-j%jobs}
 

other changes:
--------------

++++++ libcryptsvc-0.0.1.tar.gz
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -3,7 +3,6 @@
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
 SET(INCLUDEDIR "\${prefix}/include")
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
@@ -115,9 +114,9 @@
 SET(PC_REQUIRED ${pc_requires})
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 
-INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
-INSTALL(TARGETS ${LIBTZ_SO} DESTINATION lib)
+INSTALL(FILES ${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(TARGETS ${LIBTZ_SO} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${INCLUDEDIR})
 
 ADD_DEFINITIONS(-D_bool_cryptsvc)
--- cryptsvc.pc.in
+++ cryptsvc.pc.in
@@ -1,7 +1,7 @@
 # Package Information for pkg-config
 
 prefix=@PREFIX@
-libdir=@PREFIX@/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=@PREFIX@/include
 
 Name: @PC_NAME@
--- packaging/libcryptsvc.changes
+++ packaging/libcryptsvc.changes
@@ -1,3 +1,6 @@
+* Wed May 29 2013 Xavier Roche <xavrock.os at gmail.com> accepted/tizen/20130520.103533 at 7632f8e
+- Fix hardcoded library path for 64b compatibility
+
 * Sat May 18 2013 Anas Nashif <anas.nashif at intel.com> submit/tizen/20130517.045135 at 2c7d7e2
 - -avoid-version not recognised by compiler
 
--- packaging/libcryptsvc.spec
+++ packaging/libcryptsvc.spec

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list