[Tizen-submit] 6522: Changes to Tizen/calendar-service

noreply at tizen.org noreply at tizen.org
Tue Jun 4 13:05:47 GMT 2013


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

Thank You,

[This message was auto-generated]

---

Request: #6522

  submit:       Tizen:build/calendar-service(cleanup) -> Tizen


Message:
Submitter: Xavier Roche <xavrock.os at gmail.com>
Comments: Fix hardcoded library path in CMakelists
Git project: platform/core/pim/calendar-service
Tag: submit/tizen/20130604.085024
Commit: 9e6392c Changes : Fix hardcoded library path in CMakelists

State:   new        2013-06-04T06:03:54 tizenrobot
Comment: <no comment>
changes files:
--------------
--- calendar-service.changes
+++ calendar-service.changes
@@ -0,0 +1,3 @@
+* Tue Jun 04 2013 Xavier Roche <xavrock.os at gmail.com> accepted/tizen/20130523.195513 at 52e84ea
+- Fix hardcoded library path in CMakelists
+

spec files:
-----------
--- calendar-service.spec
+++ calendar-service.spec
@@ -2,7 +2,7 @@
 Summary:    DB library for calendar
 Version:    0.1.15
 Release:    1
-VCS:        platform/core/pim/calendar-service#submit/tizen/20130523.190433-0-ge1c91387de0fe976d4bf52f242bcda5caa9dd925
+VCS:        platform/core/pim/calendar-service#submit/tizen/20130604.085024-0-g9e6392cb36c5bfd0af877adcaa9000731fa00a9d
 Group:      System/Libraries
 License:    Apache 2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -55,9 +55,9 @@
 ln -s ../init.d/calendar-serviced.sh %{buildroot}/etc/rc.d/rc3.d/S85calendar-serviced
 ln -s ../init.d/calendar-serviced.sh %{buildroot}/etc/rc.d/rc5.d/S85calendar-serviced
 
-mkdir -p %{buildroot}/usr/lib/systemd/user/tizen-middleware.target.wants
-install %{SOURCE1} %{buildroot}/usr/lib/systemd/user/
-ln -s ../calendar.service %{buildroot}/usr/lib/systemd/user/tizen-middleware.target.wants/
+mkdir -p %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants
+install %{SOURCE1} %{buildroot}%{_unitdir_user}/
+ln -s ../calendar.service %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants/
 
 mkdir -p %{buildroot}/opt/usr/dbspace/.calendar-svc.db
 mkdir -p %{buildroot}/opt/usr/dbspace/.calendar-svc.db-journal
@@ -94,8 +94,8 @@
 /opt/usr/data/calendar-svc/.CALENDAR_SVC_TODO_CHANGED
 /usr/share/calendar-svc/dft-calendar
 %config(noreplace) /opt/usr/dbspace/.calendar-svc.db*
-/usr/lib/systemd/user/calendar.service
-/usr/lib/systemd/user/tizen-middleware.target.wants/calendar.service
+%{_unitdir_user}/calendar.service
+%{_unitdir_user}/tizen-middleware.target.wants/calendar.service
 
 %files devel
 %defattr(-,root,root,-)

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

++++++ calendar-service-0.1.15.tar.gz
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -11,7 +11,7 @@
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/${DEST_INCLUDE_DIR}")
 SET(VERSION_MAJOR 0)
 SET(VERSION "${VERSION_MAJOR}.1.15")
@@ -43,7 +43,7 @@
 # for immigration
 SET(IMMIGRATION "calendar-service2")
 CONFIGURE_FILE(calendar.pc.in calendar.pc @ONLY)
-INSTALL(FILES calendar.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES calendar.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 FILE(GLOB NOTI_FILES ${CMAKE_SOURCE_DIR}/.CALENDAR_SVC_*_CHANGED)
 INSTALL(FILES ${NOTI_FILES} DESTINATION /opt/usr/data/calendar-svc)
--- client/CMakeLists.txt
+++ client/CMakeLists.txt
@@ -70,9 +70,9 @@
 SET_TARGET_PROPERTIES(${CALSVC2} PROPERTIES VERSION ${VERSION})
 TARGET_LINK_LIBRARIES(${CALSVC2} ${service2_pkgs_LDFLAGS})
 
-INSTALL(TARGETS ${CALSVC2} DESTINATION lib)
+INSTALL(TARGETS ${CALSVC2} DESTINATION ${LIB_INSTALL_DIR})
 
 #pc
 CONFIGURE_FILE(${CALSVC2}.pc.in ${CALSVC2}.pc @ONLY)
-INSTALL(FILES ${CALSVC2}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CALSVC2}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
--- native/CMakeLists.txt

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


More information about the Tizen-submit mailing list