X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fappcore-widget.spec;h=7a5c05385a8e7b127215fc14bd71439294a8fab2;hb=refs%2Fheads%2Faccepted%2Ftizen_unified;hp=be7e811eab87f6a5efc35a15b4218ec3116f1181;hpb=ac5251199582de1a19f45101a4c97a988266d964;p=platform%2Fcore%2Fappfw%2Fappcore-widget.git

diff --git a/packaging/appcore-widget.spec b/packaging/appcore-widget.spec
index be7e811..e125cf8 100644
--- a/packaging/appcore-widget.spec
+++ b/packaging/appcore-widget.spec
@@ -1,18 +1,20 @@
 Name:       appcore-widget
 Summary:    Widget Application
-Version:    1.3.7
+Version:    1.5.3
 Release:    1
 Group:      Application Framework/Libraries
 License:    Apache-2.0
-Source0:    appcore-widget-%{version}.tar.gz
+Source0:    %{name}-%{version}.tar.gz
+Source1001: %{name}.manifest
 BuildRequires:  pkgconfig(aul)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(elementary)
-BuildRequires:  pkgconfig(appcore-common)
+BuildRequires:  pkgconfig(app-core-cpp)
 BuildRequires:  pkgconfig(capi-appfw-app-common)
 BuildRequires:  pkgconfig(widget_service)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(ecore-wl2)
+BuildRequires:  pkgconfig(app-core-multi-window-cpp)
 BuildRequires:  pkgconfig(appcore-multiwindow)
 BuildRequires:  pkgconfig(screen_connector_provider)
 BuildRequires:  pkgconfig(gmock)
@@ -53,10 +55,10 @@ Requires:   %{name} = %{version}-%{release}
 %description -n capi-appfw-widget-application-devel
 widget application (development files)
 
-%package -n appcore_widget_unittests
+%package -n appcore-widget-unittests
 Summary:    GTest for appcore-widget
 Group:      Development/Libraries
-%description -n appcore_widget_unittests
+%description -n appcore-widget-unittests
 GTest for appcore-widget
 
 
@@ -71,6 +73,7 @@ gcov objects of a widget application library
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 %if 0%{?gcov:1}
@@ -82,34 +85,55 @@ export LDFLAGS+=" -lgcov"
 
 export CFLAGS+=" -DEFL_BETA_API_SUPPORT "
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DBIN_INSTALL_DIR:PATH=%{_bindir}
 %__make %{?jobs:-j%jobs}
 
-%if 0%{?gcov:1}
-mkdir -p gcov-obj
-find . -name '*.gcno' -exec cp '{}' gcov-obj ';'
-%endif
-
 %install
 rm -rf %{buildroot}
 %make_install
 
 %if 0%{?gcov:1}
-mkdir -p %{buildroot}%{_datadir}/gcov/obj
-install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
+builddir=$(basename $PWD)
+gcno_obj_dir=%{buildroot}%{_datadir}/gcov/obj/%{name}/"$builddir"
+mkdir -p "$gcno_obj_dir"
+find . -name '*.gcno' -exec cp --parents '{}' "$gcno_obj_dir" ';'
 %endif
 
-mkdir -p %{buildroot}%{_libdir}/pkgconfig
-cp capi-appfw-widget-application.pc %{buildroot}%{_libdir}/pkgconfig
+cat << EOF > run-unittest.sh
+#!/bin/sh
+setup() {
+    echo "setup start"
+}
+
+test_main() {
+    echo "test_main start"
+    /usr/bin/appcore-widget-unittest
+}
+
+teardown() {
+    echo "teardown start"
+}
+
+main() {
+    setup
+    test_main
+    teardown
+}
+
+main "\$*"
+EOF
+
+mkdir -p %{buildroot}%{_bindir}/tizen-unittests/%{name}
+install -m 0755 run-unittest.sh %{buildroot}%{_bindir}/tizen-unittests/%{name}/
 
 %check
 export LD_LIBRARY_PATH=../../src/base:../../src/efl_base
 ctest -V
 %if 0%{?gcov:1}
-lcov -c --ignore-errors graph --no-external -q -d . -o appcore-widget.info
+lcov -c --ignore-errors mismatch,graph,unused --no-external -q -d . -o appcore-widget.info
 genhtml appcore-widget.info -o appcore-widget.out
 zip -r appcore-widget.zip appcore-widget.out
-install -m 0644 appcore-widget.zip %{buildroot}%{_datadir}/gcov/
+install -m 0644 appcore-widget.zip %{buildroot}%{_datadir}/gcov/obj/
 %endif
 
 %post -p /sbin/ldconfig
@@ -123,11 +147,11 @@ install -m 0644 appcore-widget.zip %{buildroot}%{_datadir}/gcov/
 %license LICENSE
 
 %files -n appcore-widget-base-devel
+/usr/include/appfw/widget_base.hh
 /usr/include/appfw/widget_base.h
 %{_libdir}/pkgconfig/appcore-widget-base.pc
 %{_libdir}/libappcore-widget-base.so
 
-
 %files -n appcore-widget
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
@@ -136,12 +160,17 @@ install -m 0644 appcore-widget.zip %{buildroot}%{_datadir}/gcov/
 
 %files -n capi-appfw-widget-application-devel
 /usr/include/appfw/widget_app.h
+/usr/include/appfw/widget_app.hpp
 /usr/include/appfw/widget_app_efl.h
 /usr/include/appfw/widget_app_internal.h
 %{_libdir}/pkgconfig/capi-appfw-widget-application.pc
 %{_libdir}/libcapi-appfw-widget-application.so
 
+%files -n appcore-widget-unittests
+%{_bindir}/appcore-widget-unittest
+%{_bindir}/tizen-unittests/%{name}/run-unittest.sh
+
 %if 0%{?gcov:1}
 %files gcov
-%{_datadir}/gcov/*
+%{_datadir}/gcov/obj/*
 %endif