merge with master

diff --git a/data/syspopup_db.sql b/data/syspopup_db.sql
index f85d4c9..5b2d027 100755 (executable)
--- a/data/syspopup_db.sql
+++ b/data/syspopup_db.sql
@@ -17,28 +17,13 @@ CREATE TABLE IF NOT EXISTS syspopup_info (
 );
 
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"syspopup-app",             2,1,5,0,0,"org.tizen.syspopup-app");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"incoming_call",            2,0,-1,2,2,"org.tizen.incoming_call");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"phone_lock",               2,0,-1,2,2,"org.tizen.screen_lock");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"screen_lock",              1,0,-1,0,2,"org.tizen.screen_lock");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"volume",                   1,1,-1,1,1,"org.tizen.volume");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"alarm",                    1,0,-1,0,2,"org.tizen.alarm");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"timer",                    1,0,5,0,2,"org.tizen.timer");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"schedule_alarm",           1,0,-1,0,2,"org.tizen.schedule_alarm");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"bt-syspopup",              0,0,-1,0,0,"org.tizen.bt-syspopup");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"change_select_network",    0,0,-1,0,0,"org.tizen.change_select_network");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"wifi-qs",                  0,0,-1,0,0,"net.wifi-qs");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"privacy_lock",             0,0,-1,0,2,"org.tizen.privacy_lock");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"poweroff-syspopup",                1,1,-1,0,0,"org.tizen.poweroff-syspopup");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"drm",                      0,0,5,0,0,"org.tizen.drm-popup");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"active_sync_policy",       0,0,-1,0,0,"org.tizen.active_sync_policy");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"memory_full",              0,1,5,0,0,"org.tizen.memory_full");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowmem-syspopup",          1,1,5,0,0,"org.tizen.lowmem-syspopup");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowbat-syspopup",          1,1,5,0,0,"org.tizen.lowbat-syspopup");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"charger_conn",             0,1,5,0,0,"org.tizen.charger_conn");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"sim_extraction",           0,1,5,0,0,"org.tizen.sim_extraction");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"time_zone_update",         0,1,5,0,0,"org.tizen.time_zone_update");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"nfc-syspopup",             0,1,3,0,0,"org.tizen.nfc-sys-popup");
-INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"push-syspopup",            2,0,5,0,0,"org.tizen.push-syspopup");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"net-popup",                        0,0,-1,0,0,"org.tizen.net-popup");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"usb-syspopup",             1,1,-1,2,2,"org.tizen.usb-syspopup");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"ims-syspopup",             1,1,-1,2,2,"org.tizen.ims-syspopup");
@@ -47,3 +32,22 @@ INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"tickernoti-syspopup",    1,1,-
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"usbotg-syspopup",          0,1,-1,0,0,"org.tizen.usbotg-syspopup");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"allshare-popup",            0,0,-1,0,0,"org.tizen.allshare-popup");
 INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"mmc-syspopup",             0,1,-1,0,0,"org.tizen.mmc-syspopup");
+
+/*
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"incoming_call",            2,0,-1,2,2,"org.tizen.incoming_call");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"phone_lock",               2,0,-1,2,2,"org.tizen.screen_lock");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"screen_lock",              1,0,-1,0,2,"org.tizen.screen_lock");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"alarm",                    1,0,-1,0,2,"org.tizen.alarm");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"timer",                    1,0,5,0,2,"org.tizen.timer");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"schedule_alarm",           1,0,-1,0,2,"org.tizen.schedule_alarm");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"change_select_network",    0,0,-1,0,0,"org.tizen.change_select_network");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"privacy_lock",             0,0,-1,0,2,"org.tizen.privacy_lock");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"active_sync_policy",       0,0,-1,0,0,"org.tizen.active_sync_policy");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"memory_full",              0,1,5,0,0,"org.tizen.memory_full");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"charger_conn",             0,1,5,0,0,"org.tizen.charger_conn");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"sim_extraction",           0,1,5,0,0,"org.tizen.sim_extraction");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"time_zone_update",         0,1,5,0,0,"org.tizen.time_zone_update");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"nfc-syspopup",             0,1,3,0,0,"org.tizen.nfc-sys-popup");
+INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"push-syspopup",            2,0,5,0,0,"org.tizen.push-syspopup");
+*/
+

diff --git a/packaging/syspopup.spec b/packaging/syspopup.spec
index 1ffa57c..f9933ae 100755 (executable)
--- a/packaging/syspopup.spec
+++ b/packaging/syspopup.spec
@@ -1,7 +1,7 @@
 
 Name:       syspopup
 Summary:    syspopup package
-Version:    0.0.86
+Version:    0.0.89
 Release:    1
 Group:      System/Libraries
 License:    Apache License, Version 2.0
@@ -65,15 +65,14 @@ rm -rf %{buildroot}
 %make_install
 
 mkdir -p %{buildroot}/opt/dbspace
-#sqlite3 $(CURDIR)/debian/tmp/opt/dbspace/.syspopup.db < $(CURDIR)/data/syspopup_db.sql
+sqlite3 %{buildroot}/opt/dbspace/.syspopup.db < %{buildroot}/usr/share/syspopup/syspopup_db.sql
+rm -rf %{buildroot}/usr/share/syspopup/syspopup_db.sql
+
 touch %{buildroot}%{_datadir}/popup_noti_term
 
 %post
 /sbin/ldconfig
 
-mkdir -p /opt/dbspace/
-sqlite3 /opt/dbspace/.syspopup.db < /usr/share/syspopup/syspopup_db.sql
-
 %postun -p /sbin/ldconfig
 
 %post caller -p /sbin/ldconfig
@@ -87,10 +86,13 @@ sqlite3 /opt/dbspace/.syspopup.db < /usr/share/syspopup/syspopup_db.sql
 %{_bindir}/sp_test
 %{_bindir}/syspopup-app
 %{_libdir}/libsyspopup.so.0.1.0
-/usr/share/syspopup/syspopup_db.sql
 /usr/share/packages/org.tizen.syspopup-app.xml
 %{_datadir}/popup_noti_term
 
+%attr(644,root,app) /opt/dbspace/.syspopup.db
+%attr(644,root,app) /opt/dbspace/.syspopup.db-journal
+
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/SLP_SYSPOPUP_PG.h

diff --git a/syspopup.manifest b/syspopup.manifest
index de64036..1d49be5 100644 (file)
--- a/syspopup.manifest
+++ b/syspopup.manifest
@@ -11,5 +11,7 @@
        <assign>
                <filesystem path="/usr/lib/libsyspopup.so.0" label="_"/>
                <filesystem path="/usr/lib/libsyspopup.so.0.1.0" label="_"/>
+               <filesystem path="/opt/dbspace/.syspopup.db" label="syspopup::db"/>
+               <filesystem path="/opt/dbspace/.syspopup.db-journal" label="syspopup::db"/>
        </assign>
 </manifest>