Update spec file for latest xwalk version

Some files are no more parts of xwalk source: xwalk.service.in, xwalk.in
and org.crosswalkproject.Runtime1.service

Also, xwalk_launcher is not a gyp target anymore.

Bug: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=13152
Reviewed by: Antonio Gomes, SeungSeop Park

Change-Id: I4fa0d00369b62a5c1dc9d334a8dbc1dbc4d0da02
Signed-off-by: Arnaud Renevier <a.renevier@samsung.com>

diff --git a/tizen_src/packaging/chromium-efl.spec b/tizen_src/packaging/chromium-efl.spec
index f008100..f5f5704 100644 (file)
--- a/tizen_src/packaging/chromium-efl.spec
+++ b/tizen_src/packaging/chromium-efl.spec
@@ -323,9 +323,7 @@ fi
 %if 0%{?build_xwalk}
   mkdir -p "%{XWALK_GEN}"
   sed "s/@VERSION@/%{version}/g" xwalk/packaging/crosswalk.xml.in > "%{XWALK_GEN}"/crosswalk.xml
-  sed "s|@LIB_INSTALL_DIR@|%{_libdir}|g" xwalk/packaging/xwalk.in > "%{XWALK_GEN}"/xwalk
-  sed "s|@LIB_INSTALL_DIR@|%{_libdir}|g" xwalk/packaging/xwalk.service.in > "%{XWALK_GEN}"/xwalk.service
-  cp -a xwalk/packaging/crosswalk.manifest "%{XWALK_GEN}"
+  cp -a xwalk/packaging/crosswalk-bin.manifest "%{XWALK_GEN}/crosswalk.manifest"
   cp -a xwalk/packaging/crosswalk.png "%{XWALK_GEN}"
   cp -a xwalk/LICENSE "%{XWALK_GEN}"/LICENSE.xwalk
   cp -a AUTHORS "%{XWALK_GEN}"/AUTHORS.chromium
@@ -378,7 +376,7 @@ tizen_src/build/prebuild/ninja %{_smp_mflags} -C"%{OUTPUT_FOLDER}" \
   chromedriver_efl \
 %endif
 %if 0%{?build_xwalk}
-  xwalk xwalk_launcher xwalk_application_tools \
+  xwalk xwalk_application_tools \
 %endif
   efl_webprocess chromium-ewk efl_webview_app mini_browser ubrowser
 
@@ -523,13 +521,9 @@ install -m 0755 tizen_src/ewk/utc_gtest_run.sh %{buildroot}/opt/usr/utc_exec/
 
 %if 0%{?build_xwalk}
 install -m 0755 -p -D %{OUTPUT_FOLDER}/xwalk %{buildroot}%{_libdir}/xwalk/xwalk
-install -m 0755 -p -D %{OUTPUT_FOLDER}/xwalkctl %{buildroot}%{_bindir}/xwalkctl
-install -m 0755 -p -D %{OUTPUT_FOLDER}/xwalk-launcher %{buildroot}%{_bindir}/xwalk-launcher
 install -m 0755 -p -D %{OUTPUT_FOLDER}/xwalk_backend %{buildroot}%{_libdir}/xwalk/xwalk_backend
 
 # Supporting libraries and resources.
-install -m 0644 -p -D xwalk/packaging/org.crosswalkproject.Runtime1.service %{buildroot}%{_dbusservicedir}/org.crosswalkproject.Runtime1.service
-install -m 0644 -p -D %{XWALK_GEN}/xwalk.service %{buildroot}%{_systemduserservicedir}/xwalk.service
 install -m 0644 -p -D %{OUTPUT_FOLDER}/lib/libxwalk_backend_lib.so %{buildroot}%{_libdir}/xwalk/libxwalk_backend_lib.so
 install -m 0644 -p -D %{OUTPUT_FOLDER}/icudtl.dat %{buildroot}%{_libdir}/xwalk/icudtl.dat
 install -m 0644 -p -D %{OUTPUT_FOLDER}/libffmpegsumo.so %{buildroot}%{_libdir}/xwalk/libffmpegsumo.so
@@ -651,8 +645,6 @@ fi
 %files -n crosswalk
 %manifest %{XWALK_GEN}/crosswalk.manifest
 %license %{XWALK_GEN}/AUTHORS.chromium %{XWALK_GEN}/LICENSE.chromium %{XWALK_GEN}/LICENSE.xwalk
-%{_bindir}/xwalkctl
-%{_bindir}/xwalk-launcher
 %{_libdir}/xwalk/icudtl.dat
 %{_libdir}/xwalk/libffmpegsumo.so
 %if %{?_disable_nacl}%{!?_disable_nacl:1} == 0
@@ -668,7 +660,5 @@ fi
 %{_libdir}/xwalk/xwalk_backend
 %{_manifestdir}/crosswalk.xml
 %{_desktop_icondir}/crosswalk.png
-%{_dbusservicedir}/org.crosswalkproject.Runtime1.service
-%{_systemduserservicedir}/xwalk.service
 %{_datadir}/xwalk/*
 %endif