Sync with 3.0

Replace db open with db open with options.
To open it with readonly option.

Change-Id: I3e7f15438f2508b71cb3ec8968ee1e6f595d6e2d

diff --git a/liblivebox-service.manifest b/packaging/liblivebox-service.manifest
similarity index 100%
rename from liblivebox-service.manifest
rename to packaging/liblivebox-service.manifest

diff --git a/packaging/liblivebox-service.spec b/packaging/liblivebox-service.spec
index 22498ab..9dcf6bf 100644 (file)
--- a/packaging/liblivebox-service.spec
+++ b/packaging/liblivebox-service.spec
@@ -1,37 +1,40 @@
-Name: liblivebox-service
-Summary: Service API for gathering installed livebox information.
-Version: 0.5.5
-Release: 1
-Group: HomeTF/Livebox
-License: Flora License
-Source0: %{name}-%{version}.tar.gz
-BuildRequires: cmake, gettext-tools, coreutils
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(gio-2.0)
-BuildRequires: pkgconfig(com-core)
-BuildRequires: pkgconfig(sqlite3)
-BuildRequires: pkgconfig(db-util)
-BuildRequires: pkgconfig(pkgmgr)
-BuildRequires: pkgconfig(pkgmgr-info)
-BuildRequires: pkgconfig(x11)
-BuildRequires: pkgconfig(vconf)
-BuildRequires: pkgconfig(ail)
-BuildRequires: pkgconfig(icu-uc)
+Name:          liblivebox-service
+Version:       0.5.6
+Release:       1
+License:       Flora
+Summary:       Service API for gathering installed livebox information
+Group:         HomeTF/Livebox
+Source0:       %{name}-%{version}.tar.gz
+Source1001:    %{name}.manifest
+BuildRequires: cmake
+BuildRequires: coreutils
+BuildRequires: gettext-tools
+BuildRequires: pkgconfig(dlog)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gio-2.0)
+BuildRequires: pkgconfig(com-core)
+BuildRequires: pkgconfig(sqlite3)
+BuildRequires: pkgconfig(db-util)
+BuildRequires: pkgconfig(pkgmgr)
+BuildRequires: pkgconfig(pkgmgr-info)
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(vconf)
+BuildRequires: pkgconfig(ail)
+BuildRequires: pkgconfig(icu-uc)
 
 %description
 Service API for gathering information of installed liveboxes
 
 %package devel
-Summary: Files for livebox service.
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Summary:       Files for livebox service
+Requires:      %{name} = %{version}-%{release}
 
 %description devel
 Gathering the installed livebox information.
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 %if 0%{?tizen_build_binary_release_type_eng}
@@ -40,22 +43,24 @@ export CXXFLAGS="${CXXFLAGS} -DTIZEN_ENGINEER_MODE"
 export FFLAGS="${FFLAGS} -DTIZEN_ENGINEER_MODE"
 %endif
 %cmake .
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 %make_install
 mkdir -p %{buildroot}/%{_datarootdir}/license
 
-%post
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files -n liblivebox-service
-%manifest liblivebox-service.manifest
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/*.so*
 %{_datarootdir}/license/*
 
 %files devel
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/livebox-service/livebox-service.h
 %{_includedir}/livebox-service/livebox-errno.h

diff --git a/src/livebox-service.c b/src/livebox-service.c
index 3874db4..bd3da62 100644 (file)
--- a/src/livebox-service.c
+++ b/src/livebox-service.c
@@ -323,7 +323,7 @@ static sqlite3 *open_db(void)
        if (!s_info.handle) {
                int ret;
 
-               ret = db_util_open(s_info.dbfile, &handle, DB_UTIL_REGISTER_HOOK_METHOD);
+               ret = db_util_open_with_options(s_info.dbfile, &handle, SQLITE_OPEN_READONLY, NULL);
                if (ret != SQLITE_OK) {
                        ErrPrint("Failed to open a DB\n");
                        return NULL;