X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=packaging%2Flibtdm.spec;h=493b7b7f37361cbb867727b9582dbc53018736b6;hb=ff24c59c2316df5e88162fb202df293873f60c17;hp=e2ddf340bc4d886e0a7aa3e3c64fc8790f7567cf;hpb=c0d2101b557122d8e81c092dea81ae369e43da2d;p=platform%2Fcore%2Fuifw%2Flibtdm.git

diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec
index e2ddf34..493b7b7 100644
--- a/packaging/libtdm.spec
+++ b/packaging/libtdm.spec
@@ -1,7 +1,8 @@
-%bcond_with utest
+%define UTEST_PACKAGE 1
+%define UTEST_GCOV    0
 
 Name:           libtdm
-Version:        1.6.13
+Version:        1.16.12
 Release:        0
 Summary:        User Library of Tizen Display Manager
 Group:          Development/Libraries
@@ -12,11 +13,9 @@ BuildRequires:  pkgconfig(libtbm)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(ttrace)
 BuildRequires:  pkgconfig(wayland-server)
+BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(pixman-1)
-
-%if %{with utest}
-BuildRequires:  gtest-devel
-%endif
+BuildRequires:  gtest-devel 
 
 %description
 Common user library of Tizen Display Manager : libtdm front-end library
@@ -47,6 +46,15 @@ Requires:       libtdm-devel
 %description client-devel
 Tizen Display Manager Client Library headers
 
+%if "%{UTEST_PACKAGE}" == "1"
+%package utests
+Summary: Tizen Display Manager unit tests package
+Group: Development/Libraries
+
+%description utests
+Test module for testing libtdm APIs
+%endif
+
 %global TZ_SYS_RO_SHARE  %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:/usr/share}
 
 %package tools
@@ -64,26 +72,27 @@ cp %{SOURCE1001} .
 %build
 UTEST="no"
 
-%if %{with utest}
+%if "%{UTEST_PACKAGE}" == "1"
 UTEST="yes"
 %endif
 
-%reconfigure --disable-static --with-utest=${UTEST} \
+%if "%{UTEST_GCOV}" == "1"
+CFLAGS+=" -fprofile-arcs -ftest-coverage -DTIZEN_TEST_GCOV"
+CXXFLAGS+=" -fprofile-arcs -ftest-coverage -DTIZEN_TEST_GCOV"
+LDFLAGS+=" -lgcov"
+%endif
+
+%reconfigure --disable-static --with-utests=${UTEST} \
+             --with-tdm-data-path=%{TZ_SYS_RO_SHARE}/tdm \
              CFLAGS="${CFLAGS} -Wall -Werror" \
+             CXXFLAGS="${CXXFLAGS} -Wall -Werror" \
              LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed"
 make %{?_smp_mflags}
 
-%if %{with utest}
-make -C ut check
-%endif
-
 %install
 rm -rf %{buildroot}
 %make_install
 
-%__mkdir_p %{buildroot}%{_unitdir}
-install -m 644 service/tdm-socket.service %{buildroot}%{_unitdir}
-install -m 644 service/tdm-socket.path %{buildroot}%{_unitdir}
 %__mkdir_p %{buildroot}%{_unitdir_user}
 install -m 644 service/tdm-socket-user.service %{buildroot}%{_unitdir_user}
 install -m 644 service/tdm-socket-user.path %{buildroot}%{_unitdir_user}
@@ -92,16 +101,11 @@ install -m 644 service/tdm-socket-user.path %{buildroot}%{_unitdir_user}
 
 
 %pre
-%__mkdir_p %{_unitdir}/graphical.target.wants
-ln -sf ../tdm-socket.path %{_unitdir}/graphical.target.wants/
-
 %__mkdir_p %{_unitdir_user}/basic.target.wants
 ln -sf ../tdm-socket-user.path %{_unitdir_user}/basic.target.wants/
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
-rm -f %{_unitdir}/graphical.target.wants/tdm-socket.path
-
 rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
 
 %files
@@ -109,14 +113,10 @@ rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
 %defattr(-,root,root,-)
 %license COPYING
 %{_libdir}/libtdm.so.*
+%{_libdir}/tdm/libtdm-dummy.so
 %attr(750,root,root) %{_bindir}/tdm-monitor
-%{_unitdir}/tdm-socket.path
-%{_unitdir}/tdm-socket.service
 %{_unitdir_user}/tdm-socket-user.path
 %{_unitdir_user}/tdm-socket-user.service
-%if %{with utest}
-%{_bindir}/ut
-%endif
 
 %files devel
 %manifest %{name}.manifest
@@ -128,6 +128,7 @@ rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
 %{_includedir}/tdm_list.h
 %{_includedir}/tdm_log.h
 %{_includedir}/tdm_types.h
+%{_includedir}/tdm_deprecated.h
 %{_libdir}/pkgconfig/libtdm.pc
 %{_libdir}/libtdm.so
 
@@ -150,4 +151,10 @@ rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
 %attr(750,root,root) %{_bindir}/tdm-test-server
 %{_bindir}/tdm-test-client
 
+%if "%{UTEST_PACKAGE}" == "1"
+%files utests
+%defattr(-,root,root,-)
+%{_bindir}/tdm-utests
+%endif
+
 %changelog