Modify script numbering

- in general case(no dependency with other scripts), use 500 numbering

Change-Id: I4bda8ccbc20f7c3364aaa3c58e7786e2f94dc7aa

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3efd1909c2e4078a90eece2d75692ca08aac01f..36b9e218e6c5eec68fc2765aa65c056c3a25361f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ SET_TARGET_PROPERTIES(ps-plugin PROPERTIES PREFIX "" OUTPUT_NAME ps-plugin)
 # install
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/dnet_db.sql DESTINATION ${DATAROOTDIR}/ps-plugin)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/dnet_db_upgrade_24_30.sql DESTINATION ${DATAROOTDIR}/ps-plugin)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/dnet_db_upgrade_24_30.sh DESTINATION ${DATAROOTDIR}/upgrade/scripts)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/500.dnet_db_upgrade_24_30.sh DESTINATION ${DATAROOTDIR}/upgrade/scripts)
 INSTALL(FILES ${RES_DIR}/dnet_db_init.sql DESTINATION ${DATAROOTDIR}/ps-plugin)
 #INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/apns-conf.xml DESTINATION ${DATAROOTDIR}/ps-plugin)
 INSTALL(TARGETS ps-plugin LIBRARY DESTINATION ${LIBDIR}/telephony/plugins)

diff --git a/packaging/tel-plugin-packetservice.spec b/packaging/tel-plugin-packetservice.spec
index 5aca165602abe47a4b1e0a3582d6d923450ca822..adc95bbc2475ccc31d65ab97b6a82e974b0b6404 100644 (file)
--- a/packaging/tel-plugin-packetservice.spec
+++ b/packaging/tel-plugin-packetservice.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 34
+%define patchlevel 35
 
 Name:           tel-plugin-packetservice
 Version:        %{major}.%{minor}.%{patchlevel}
@@ -112,7 +112,7 @@ cp %{SOURCE1} %{buildroot}/etc/dbus-1/system.d/tel-plugin-ps.conf
 %{_datadir}/ps-plugin/dnet_db.sql
 %{_datadir}/ps-plugin/dnet_db_init.sql
 %{_datadir}/ps-plugin/dnet_db_upgrade_24_30.sql
-%{_datadir}/upgrade/scripts/dnet_db_upgrade_24_30.sh
+%{_datadir}/upgrade/scripts/500.dnet_db_upgrade_24_30.sh
 #%{_datadir}/ps-plugin/apns-conf.xml
 %{_libdir}/telephony/plugins/ps-plugin*
 %{_datadir}/license/tel-plugin-packetservice

diff --git a/resources/500.dnet_db_upgrade_24_30.sh b/resources/500.dnet_db_upgrade_24_30.sh
new file mode 100644 (file)
index 0000000..25d97fd
--- /dev/null
+++ b/resources/500.dnet_db_upgrade_24_30.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+/usr/bin/sqlite3 /opt/dbspace/.dnet.db < /usr/share/ps-plugin/dnet_db_upgrade_24_30.sql
+/usr/bin/sqlite3 /opt/dbspace/.dnet2.db < /usr/share/ps-plugin/dnet_db_upgrade_24_30.sql
+
+chown telephony:telephony /opt/dbspace/.dnet.db
+chown telephony:telephony /opt/dbspace/.dnet.db-journal
+chown telephony:telephony /opt/dbspace/.dnet2.db
+chown telephony:telephony /opt/dbspace/.dnet2.db-journal
+
+chsmack -a System /opt/dbspace/.dnet.db
+chsmack -a System /opt/dbspace/.dnet.db-journal
+chsmack -a System /opt/dbspace/.dnet2.db
+chsmack -a System /opt/dbspace/.dnet2.db-journal

diff --git a/resources/dnet_db_upgrade_24_30.sh b/resources/dnet_db_upgrade_24_30.sh
deleted file mode 100644 (file)
index 25d97fd..0000000
--- a/resources/dnet_db_upgrade_24_30.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-/usr/bin/sqlite3 /opt/dbspace/.dnet.db < /usr/share/ps-plugin/dnet_db_upgrade_24_30.sql
-/usr/bin/sqlite3 /opt/dbspace/.dnet2.db < /usr/share/ps-plugin/dnet_db_upgrade_24_30.sql
-
-chown telephony:telephony /opt/dbspace/.dnet.db
-chown telephony:telephony /opt/dbspace/.dnet.db-journal
-chown telephony:telephony /opt/dbspace/.dnet2.db
-chown telephony:telephony /opt/dbspace/.dnet2.db-journal
-
-chsmack -a System /opt/dbspace/.dnet.db
-chsmack -a System /opt/dbspace/.dnet.db-journal
-chsmack -a System /opt/dbspace/.dnet2.db
-chsmack -a System /opt/dbspace/.dnet2.db-journal