diff options
author | Anas Nashif <anas.nashif@intel.com> | 2013-06-25 13:11:26 -0400 |
---|---|---|
committer | Anas Nashif <anas.nashif@intel.com> | 2013-06-25 13:14:14 -0400 |
commit | 8ca9fe4c46e95b534c78313589fde27259be3f11 (patch) | |
tree | 948b58f6570528b2034f9b7c321aa8189464ab77 | |
parent | e4ae04f7e18435444485feb9e8f49cc87b28b4dd (diff) | |
download | badge-8ca9fe4c46e95b534c78313589fde27259be3f11.tar.gz badge-8ca9fe4c46e95b534c78313589fde27259be3f11.tar.bz2 badge-8ca9fe4c46e95b534c78313589fde27259be3f11.zip |
Cleanup packaging and install database in %installsubmit/tizen/20130701.181039accepted/tizen/20130702.012549
- Move sql data into a seperate file
- install database in %install section
- cleanup %post
Change-Id: I269c26edafff70e427efe7ea0847de1478b204e6
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | badge.sql | 13 | ||||
-rw-r--r-- | packaging/badge.changes | 3 | ||||
-rw-r--r-- | packaging/badge.spec | 65 |
4 files changed, 42 insertions, 41 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 71d3088..f158b23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -g -Wall -O2") +SET(EXTRA_CFLAGS "${EXTRA_CFLAGS}") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") diff --git a/badge.sql b/badge.sql new file mode 100644 index 0000000..c2a9cb9 --- /dev/null +++ b/badge.sql @@ -0,0 +1,13 @@ +PRAGMA journal_mode = PERSIST; + create table if not exists badge_data ( + pkgname TEXT NOT NULL, + writable_pkgs TEXT, + badge INTEGER default 0, + rowid INTEGER PRIMARY KEY AUTOINCREMENT, + UNIQUE (pkgname) + ); + create table if not exists badge_option ( + pkgname TEXT NOT NULL, + display INTEGER default 1, + UNIQUE (pkgname) + ); diff --git a/packaging/badge.changes b/packaging/badge.changes index 01b17cb..99c4a1e 100644 --- a/packaging/badge.changes +++ b/packaging/badge.changes @@ -1,3 +1,6 @@ +* Tue Jun 25 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130613.135716@3df4bc8 +- Cleanup packaging and install database in %install + * Thu May 30 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130517.044805@581dd0c - Remove license/group placeholders diff --git a/packaging/badge.spec b/packaging/badge.spec index 221a492..497db51 100644 --- a/packaging/badge.spec +++ b/packaging/badge.spec @@ -12,72 +12,57 @@ BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(com-core) BuildRequires: cmake +BuildRequires: sqlite3 +Requires: libbadge + %description Badge library. -%prep -%setup -q +%package -n libbadge +Summary: Badge Library +Requires: %{name} = %{version}-%{release} + +%description -n libbadge +Badge library. + %package devel Summary: Badge library (devel) Group: Application Framework/Development -Requires: %{name} = %{version}-%{release} +Requires: libbadge = %{version}-%{release} %description devel Badge library (devel). +%prep +%setup -q + %build %cmake . make %{?jobs:-j%jobs} %install %make_install +mkdir -p %{buildroot}/opt/dbspace +sqlite3 %{buildroot}/opt/dbspace/.%{name}.db < %{name}.sql -%post -/sbin/ldconfig - -if [ ! -d %{DBDIR} ] -then - mkdir -p %{DBDIR} -fi +%post -p /sbin/ldconfig -n libbadge -if [ ! -f %{DBDIR}/.%{name}.db ] -then - sqlite3 %{DBDIR}/.%{name}.db 'PRAGMA journal_mode = PERSIST; - create table if not exists badge_data ( - pkgname TEXT NOT NULL, - writable_pkgs TEXT, - badge INTEGER default 0, - rowid INTEGER PRIMARY KEY AUTOINCREMENT, - UNIQUE (pkgname) - ); - create table if not exists badge_option ( - pkgname TEXT NOT NULL, - display INTEGER default 1, - UNIQUE (pkgname) - ); - ' -fi +%postun -p /sbin/ldconfig -n libbadge -chown :5000 %{DBDIR}/.%{name}.db -chown :5000 %{DBDIR}/.%{name}.db-journal -chmod 660 %{DBDIR}/.%{name}.db -chmod 660 %{DBDIR}/.%{name}.db-journal -if [ -f /usr/lib/rpm-plugins/msm.so ] -then - chsmack -a 'badge::db' %{DBDIR}/.%{name}.db* -fi - -%postun -p /sbin/ldconfig - -%files +%files -n libbadge %license LICENSE.APLv2.0 %manifest badge.manifest %defattr(-,root,root,-) -%{_libdir}/lib%{name}.so* +%{_libdir}/libbadge.so.* + +%files +%verify(not md5 size mtime) %config(noreplace) %attr(660,root,app) /opt/dbspace/.%{name}.db-journal +%verify(not md5 size mtime) %config(noreplace) %attr(660,root,app) /opt/dbspace/.%{name}.db %files devel %defattr(-,root,root,-) %{_includedir}/%{name}/*.h +%{_libdir}/libbadge.so %{_libdir}/pkgconfig/%{name}.pc |