X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Flibtdm.spec;h=babfb34c64f8e0406cf00fe0045d60c451660f56;hb=757bc1903bc8413e372c138717efae7a5256a0d7;hp=379226a35b0f3a3a19b6468bc26f05a1f9912473;hpb=32a2d7c2c20505164f85d5d4fb5f960c69fc2ccf;p=platform%2Fcore%2Fuifw%2Flibtdm.git diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec index 379226a..babfb34 100644 --- a/packaging/libtdm.spec +++ b/packaging/libtdm.spec @@ -1,7 +1,7 @@ %bcond_with utest Name: libtdm -Version: 1.4.3 +Version: 1.4.5 Release: 0 Summary: User Library of Tizen Display Manager Group: Development/Libraries @@ -14,6 +14,10 @@ BuildRequires: pkgconfig(ttrace) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(pixman-1) +%if %{with utest} +BuildRequires: gtest-devel +%endif + %description Common user library of Tizen Display Manager : libtdm front-end library @@ -43,15 +47,6 @@ Requires: libtdm-devel %description client-devel Tizen Display Manager Client Library headers -%if %{with utest} -%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 @@ -70,11 +65,6 @@ cp %{SOURCE1001} . UTEST="no" %if %{with utest} -cd ut/gtest/googletest -autoreconf --install -./configure -make -cd ../../.. UTEST="yes" %endif @@ -83,13 +73,14 @@ UTEST="yes" LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed" make %{?_smp_mflags} +%if %{with utest} +make -C ut check +%endif + %install rm -rf %{buildroot} mkdir -p %{buildroot}/%{TZ_SYS_RO_SHARE}/license cp -af COPYING %{buildroot}/%{TZ_SYS_RO_SHARE}/license/%{name} -%if %{with utest} -cp -af %{_builddir}/%{buildsubdir}/ut/gtest/googletest/LICENSE %{buildroot}/%{TZ_SYS_RO_SHARE}/license/googletest -%endif %make_install %__mkdir_p %{buildroot}%{_unitdir} @@ -134,6 +125,9 @@ rm -f %{_unitdir_user}/default.target.wants/tdm-socket-user.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 @@ -167,12 +161,4 @@ rm -f %{_unitdir_user}/default.target.wants/tdm-socket-user.path %attr(750,root,root) %{_bindir}/tdm-test-server %{_bindir}/tdm-test-client -%if %{with utest} -%files utests -%defattr(-,root,root,-) -%{_bindir}/tdm_utests -%{TZ_SYS_RO_SHARE}/license/%{name} -%{TZ_SYS_RO_SHARE}/license/googletest -%endif - %changelog