From: Soyoung Kim Date: Tue, 28 May 2013 09:41:52 +0000 (+0900) Subject: Fixed systemd X-Git-Tag: submit/tizen_2.2/20130713.111652^2~90 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=791481b5723ed3755dc91082260c5ff382c1d595;p=platform%2Fframework%2Fweb%2Fwrt-installer.git Fixed systemd [Issue#] N/A [Problem] N/A [Cause] N/A [Solution] fixed systemd about wrt-preinstall-widgets.service [SCMRequest] N/A Change-Id: I9f067f0d179b5de0413c45ec2c1003b5872f1bda --- diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec index 8f21a57..313dfcf 100644 --- a/packaging/wrt-installer.spec +++ b/packaging/wrt-installer.spec @@ -7,7 +7,7 @@ Group: Development/Libraries License: Apache License, Version 2.0 URL: N/A Source0: %{name}-%{version}.tar.gz -Source100: wrt-preinstall-widgets.service +Source1: wrt-preinstall-widgets.service BuildRequires: cmake BuildRequires: edje-tools BuildRequires: pkgconfig(appsvc) @@ -75,10 +75,9 @@ mkdir -p %{buildroot}/usr/share/license cp LICENSE %{buildroot}/usr/share/license/%{name} %make_install -mkdir -p %{buildroot}%{_libdir}/systemd/user -install -m 644 %{SOURCE100} %{buildroot}%{_libdir}/systemd/user -mkdir -p %{buildroot}%{_libdir}/systemd/user/tizen-mobile-session.target.wants -ln -s ../wrt-preinstall-widgets.service %{buildroot}%{_libdir}/systemd/user/tizen-mobile-session.target.wants +mkdir -p %{buildroot}%{_libdir}/systemd/system/tizen-runtime.target.wants +install -m 644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/wrt-preinstall-widgets.service +ln -s ../wrt-preinstall-widgets.service %{buildroot}%{_libdir}/systemd/system/tizen-runtime.target.wants/wrt-preinstall-widgets.service %clean rm -rf %{buildroot} @@ -104,12 +103,10 @@ mkdir -p /opt/share/icons/default/small %attr(775,root,root) %{_bindir}/wrt_preinstall_widgets.sh /usr/etc/package-manager/backendlib/libwgt.so %attr(644,root,root) /usr/etc/wrt-installer/*.xsd +%{_libdir}/systemd/system/tizen-runtime.target.wants/wrt-preinstall-widgets.service +%{_libdir}/systemd/system/wrt-preinstall-widgets.service %{_datadir}/license/%{name} -%{_libdir}/systemd/user/tizen-mobile-session.target.wants/wrt-preinstall-widgets.service -%{_libdir}/systemd/user/wrt-preinstall-widgets.service %if %{with_tests} %attr(755,root,root) %{_bindir}/wrt-installer-tests-* /opt/share/widget/tests/installer/widgets/* %endif -%{_libdir}/systemd/user/tizen-mobile-session.target.wants/wrt-preinstall-widgets.service -%{_libdir}/systemd/user/wrt-preinstall-widgets.service diff --git a/packaging/wrt-preinstall-widgets.service b/packaging/wrt-preinstall-widgets.service index d80999e..2a66867 100644 --- a/packaging/wrt-preinstall-widgets.service +++ b/packaging/wrt-preinstall-widgets.service @@ -1,8 +1,11 @@ [Unit] -Description=Installation of pre-installed widgets -ConditionPathExists=/opt/media/Downloads/.preinstallWidgets -After=xorg.target e17.service +Description=WRT Preinstall Widgets +After=tizen-system.target +Requires=tizen-system.target [Service] -Type=oneshot +Type=forking ExecStart=/usr/bin/wrt_preinstall_widgets.sh + +[Install] +WantedBy=tizen-runtime.target