fix upgrade script because email-service.sql

Change-Id: Id29621f03e4d0cd69391106665699a48ba08a604
Signed-off-by: intae, jeon <intae.jeon@samsung.com>

diff --git a/500.email-service.patch.sh b/500.email-service.patch.sh
index 66d5b9b..070de7c 100644 (file)
--- a/500.email-service.patch.sh
+++ b/500.email-service.patch.sh
@@ -18,14 +18,21 @@ DATA_DIR_30=/opt/usr/home/owner/data
 EMSVC_DATA_24=$DATA_DIR_24/email
 EMSVC_DATA_30=$DATA_DIR_30/email
 
+UPGRADE_DATA_DIR=/usr/share/upgrade/data
+UPGRADE_DATA_FILE=$UPGRADE_DATA_DIR/email-service.sql
+
+EM_COMMON_DATA_30=/opt/data/email
+EM_RES_DATA_30=$EM_COMMON_DATA_30/res
 
 # Make Directory
-mkdir $DATA_DIR_30
+mkdir -p $DATA_DIR_30
+mkdir -p $EM_RES_DATA_30
 
 # Move
 mv $DB_FILE_24 $DB_FILE_30
 mv $EMSVC_DATA_24 $EMSVC_DATA_30
 mv $DB_FILE_24-journal $DB_FILE_30-journal
+mv $UPGRADE_DATA_FILE $EM_RES_DATA_30
 
 chown owner:users $DB_FILE_30
 chown owner:users $DATA_DIR_30

diff --git a/packaging/email-service.spec b/packaging/email-service.spec
index a025dc5..9927059 100755 (executable)
--- a/packaging/email-service.spec
+++ b/packaging/email-service.spec
@@ -69,8 +69,10 @@ BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  pkgconfig(sqlite3)
 Requires: libtzplatform-config
 
-%define upgrade_script_path /usr/share/upgrade/scripts
 
+# OS update
+%define upgrade_script_path /usr/share/upgrade/scripts
+%define upgrade_data_path /usr/share/upgrade/data
 
 %description
 E-mail Framework Middleware Library/Binary package
@@ -111,8 +113,12 @@ mkdir -p %{buildroot}/usr/share/license
 if [ -d %{_datarootdir}/license/email-service]; then
        rm -rf %{_datarootdir}/license/email-service
 fi
+
+# OS update
 mkdir -p %{buildroot}%{upgrade_script_path}
+mkdir -p %{buildroot}%{upgrade_data_path}
 cp -f 500.%{name}.patch.sh %{buildroot}%{upgrade_script_path}
+cp -f res/%{name}.sql %{buildroot}%{upgrade_data_path}
 
 %make_install
 
@@ -163,7 +169,10 @@ systemctl daemon-reload
 %{_datarootdir}/license/email-service
 %attr(0775,root,root) /etc/rc.d/init.d/email-service
 %{_bindir}/email-service_init_db.sh
+
+# OS update
 %{upgrade_script_path}/500.%{name}.patch.sh
+%{upgrade_data_path}/%{name}.sql
 
 %files devel
 %{_includedir}/email-service/*.h