modify service name. livebox -> appwidget

Change-Id: I93a719a1f595ed1d595147d39f88f673483494c8
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a3af89a1431e7d831186d20eadf80e41f6ac1ca..e1587e113c9666cc4211e7058e75184cbafae6d3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-SET (this_target osp-livebox-service)
+SET (this_target osp-appwidget-service)
 SET (PACKAGEID gi2qxenosh)
 
 SET(CMAKE_EXECUTABLE_SUFFIX ".exe")

diff --git a/osp-appwidget-service.manifest b/osp-appwidget-service.manifest
new file mode 100644 (file)
index 0000000..08fa244
--- /dev/null
+++ b/osp-appwidget-service.manifest
@@ -0,0 +1,26 @@
+<manifest>
+       <define>
+               <domain name="gi2qxenosh" policy="restricted" />
+               <request>
+                       <smack request="system::homedir" type="rx"/>
+                       <smack request="system::use_internet" type="r"/>
+                       <smack request="system::vconf" type="rwx"/>
+                       <smack request="sys-assert::core" type="rwxa"/>
+                       <smack request="syslogd" type="w"/>
+                       <smack request="pkgmgr::db" type="rw"/>
+                       <smack request="ail::db" type="rw"/>
+                       <smack request="notification::db" type="rw"/>
+                       <smack request="xorg" type="w"/>
+                       <smack request="isf" type="rx"/>
+                       <smack request="data-provider-master" type="w"/>
+                       <smack request="data-provider-master::share" type="x"/>
+               </request>
+       </define>
+       <request>
+               <domain name="gi2qxenosh"/>
+       </request>
+       <assign>
+               <filesystem path="/usr/apps/gi2qxenosh/bin/osp-appwidget-service.exe" label="gi2qxenosh" exec_label="gi2qxenosh"/>
+               <filesystem path="/usr/share/license/osp-appwidget-service" label="_"/>
+       </assign>
+</manifest>

diff --git a/osp-livebox-service.manifest b/osp-livebox-service.manifest
deleted file mode 100644 (file)
index c0325a7..0000000
--- a/osp-livebox-service.manifest
+++ /dev/null
@@ -1,26 +0,0 @@
-<manifest>
-       <define>
-               <domain name="gi2qxenosh" policy="restricted" />
-               <request>
-                       <smack request="system::homedir" type="rx"/>
-                       <smack request="system::use_internet" type="r"/>
-                       <smack request="system::vconf" type="rwx"/>
-                       <smack request="sys-assert::core" type="rwxa"/>
-                       <smack request="syslogd" type="w"/>
-                       <smack request="pkgmgr::db" type="rw"/>
-                       <smack request="ail::db" type="rw"/>
-                       <smack request="notification::db" type="rw"/>
-                       <smack request="xorg" type="w"/>
-                       <smack request="isf" type="rx"/>
-                       <smack request="data-provider-master" type="w"/>
-                       <smack request="data-provider-master::share" type="x"/>
-               </request>
-       </define>
-       <request>
-               <domain name="gi2qxenosh"/>
-       </request>
-       <assign>
-               <filesystem path="/usr/apps/gi2qxenosh/bin/osp-livebox-service.exe" label="gi2qxenosh" exec_label="gi2qxenosh"/>
-               <filesystem path="/usr/share/license/osp-livebox-service" label="_"/>
-       </assign>
-</manifest>

diff --git a/packaging/osp-appwidget-service.spec b/packaging/osp-appwidget-service.spec
new file mode 100644 (file)
index 0000000..141c076
--- /dev/null
+++ b/packaging/osp-appwidget-service.spec
@@ -0,0 +1,67 @@
+Name: osp-appwidget-service
+Summary:       osp appwidget service
+Version:       1.2.1.0
+Release:       1
+Group:         System/Libraries
+License:       Apache License, Version 2.0 
+Source0:       %{name}-%{version}.tar.gz
+BuildRequires:  cmake
+BuildRequires:  pkgconfig(chromium)
+BuildRequires:  pkgconfig(capi-appfw-application)
+BuildRequires:  pkgconfig(aul)
+BuildRequires:  pkgconfig(bundle)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(provider)
+BuildRequires:  pkgconfig(osp-appfw)
+BuildRequires:  pkgconfig(osp-uifw)
+BuildRequires:  pkgconfig(osp-image)
+BuildRequires:  pkgconfig(osp-shell)
+BuildRequires:  osp-shell-internal-devel
+BuildRequires:  osp-appfw-internal-devel
+
+# runtime requires
+Requires: chromium
+Requires: osp-appfw
+Requires: osp-shell
+Requires: data-provider-master
+ 
+%description
+osp appwidget service
+
+%prep
+%setup -q
+
+%build 
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+%ifarch %{ix86}
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%else
+CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%endif
+
+# Call make instruction with smp support
+make %{?jobs:-j%jobs}
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/usr/share/license
+cp %{_builddir}/%{name}-%{version}/LICENSE  %{buildroot}/usr/share/license/%{name}
+
+%make_install
+
+%post
+
+/bin/rm -fr /opt/apps/gi2qxenosh
+
+/usr/etc/package-manager/backend/tpk -i /usr/apps/gi2qxenosh
+cp -f %{_libdir}/osp/osp-system-service-loader /usr/apps/gi2qxenosh/bin/%{name}
+
+#%postun -p /sbin/ldconfig
+
+%files
+%manifest %{name}.manifest
+/usr/share/license/%{name}
+/usr/apps/*
+#/opt/apps/gi2qxenosh/*
+
+

diff --git a/packaging/osp-livebox-service.spec b/packaging/osp-livebox-service.spec
deleted file mode 100644 (file)
index ed1a1bb..0000000
--- a/packaging/osp-livebox-service.spec
+++ /dev/null
@@ -1,67 +0,0 @@
-Name: osp-livebox-service
-Summary:       osp livebox service
-Version:       1.2.1.0
-Release:       1
-Group:         System/Libraries
-License:       Apache License, Version 2.0 
-Source0:       %{name}-%{version}.tar.gz
-BuildRequires:  cmake
-BuildRequires:  pkgconfig(chromium)
-BuildRequires:  pkgconfig(capi-appfw-application)
-BuildRequires:  pkgconfig(aul)
-BuildRequires:  pkgconfig(bundle)
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(provider)
-BuildRequires:  pkgconfig(osp-appfw)
-BuildRequires:  pkgconfig(osp-uifw)
-BuildRequires:  pkgconfig(osp-image)
-BuildRequires:  pkgconfig(osp-shell)
-BuildRequires:  osp-shell-internal-devel
-BuildRequires:  osp-appfw-internal-devel
-
-# runtime requires
-Requires: chromium
-Requires: osp-appfw
-Requires: osp-shell
-Requires: data-provider-master
- 
-%description
-osp livebox service
-
-%prep
-%setup -q
-
-%build 
-MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%ifarch %{ix86}
-CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
-%else
-CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
-%endif
-
-# Call make instruction with smp support
-make %{?jobs:-j%jobs}
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp %{_builddir}/%{name}-%{version}/LICENSE  %{buildroot}/usr/share/license/%{name}
-
-%make_install
-
-%post
-
-/bin/rm -fr /opt/apps/gi2qxenosh
-
-/usr/etc/package-manager/backend/tpk -i /usr/apps/gi2qxenosh
-cp -f %{_libdir}/osp/osp-system-service-loader /usr/apps/gi2qxenosh/bin/%{name}
-
-#%postun -p /sbin/ldconfig
-
-%files
-%manifest %{name}.manifest
-/usr/share/license/%{name}
-/usr/apps/*
-#/opt/apps/gi2qxenosh/*
-
-

diff --git a/src/FShell_AppWidgetManagerService.cpp b/src/FShell_AppWidgetManagerService.cpp
index 054680c2f9a99980ab452e97438244f41f8ba455..e52a2eeb5768345ad877d2ded9d793b9345d8ef7 100644 (file)
--- a/src/FShell_AppWidgetManagerService.cpp
+++ b/src/FShell_AppWidgetManagerService.cpp
@@ -94,7 +94,7 @@ AppWidgetManagerService::Construct()
        r = __handlerThread.Start();
        SysTryReturn(NID_APP, IsFailed(r) == false, false, r, "[%s] Event thread Start failure.", GetErrorMessage(r));
 
-       return InitializeMasterDaemonEventReceiver("osp-livebox-service");
+       return InitializeMasterDaemonEventReceiver("osp-appwidget-service");
 }
 
 int