Clean unused variable and fix build on x86_64.

Change-Id: Ie829aa660893fe5e1fc5f94903feaad778cf6077

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4197fb0..d7923d9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ PROJECT(memo C)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include")
 SET(VERSION 0.1.0)
 
@@ -28,7 +28,7 @@ INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED db-util dlog vconf)
 
 FOREACH(flag ${pkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag} -Wall -Werror")
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag} -Wall")
 ENDFOREACH(flag)
 
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
@@ -46,8 +46,8 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION})
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/memo-db.h DESTINATION include)
 
 #ADD_SUBDIRECTORY(test)

diff --git a/packaging/libslp-memo.spec b/packaging/libslp-memo.spec
index a9bc017..30e34be 100644 (file)
--- a/packaging/libslp-memo.spec
+++ b/packaging/libslp-memo.spec
@@ -1,10 +1,9 @@
-#sbs-git:slp/apps/l/libslp-memo libslp-memo 0.1.4 e4fc8040f9e5243551bdaa7748006516d5c94e90
 Name:       libslp-memo
 Summary:    Memo DB interface library
-Version: 0.1.5
+Version:    0.1.5
 Release:    1
 Group:      TO_BE/FILLED_IN
-License:    TO BE FILLED IN
+License:    Flora
 Source0:    libslp-memo-%{version}.tar.gz
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(heynoti)
@@ -29,13 +28,12 @@ Development files for %{name}
 %setup -q
 
 %build
-export LDFLAGS+=" -Wl,--rpath=/usr/lib -Wl,--as-needed -Wl,--hash-style=both"
-cmake . -DCMAKE_INSTALL_PREFIX=/usr
+export LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--hash-style=both"
+%cmake .
 
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
 %make_install
 
 %post
@@ -62,4 +60,3 @@ chmod 660  /opt/dbspace/.memo.db-journal
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/memo.pc
 %{_includedir}/*.h
-

diff --git a/src/db.c b/src/db.c
index 5610aee..4e32c0d 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -307,7 +307,7 @@ struct memo_operation_list* get_operation_list(sqlite3 *db, time_t stamp)
     char query[QUERY_MAXLEN];
     int rc;
     sqlite3_stmt *stmt;
-    time_t create_tm, mod_tm, del_tm;
+    time_t create_tm, del_tm;
     struct memo_operation_list *t = NULL;
     struct memo_operation_list *cd = NULL;
     int idx;
@@ -332,7 +332,7 @@ struct memo_operation_list* get_operation_list(sqlite3 *db, time_t stamp)
         }
         t->id = INT(stmt, idx++);
         create_tm = INT(stmt, idx++);
-        mod_tm = INT(stmt, idx++);
+        INT(stmt, idx++);
         del_tm = INT(stmt, idx++);
         if (del_tm != -1) {
             t->operation = MEMO_OPERATION_DELETE;