X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=packaging%2Flibtdm.spec;h=afc3d6dc09fe66ff2dafd10c6141033c3cc58c6d;hb=398989bae0addb8c17264d1bee02509fafcd101d;hp=a8f8003eda5bf8a65a4ea5ec266e643de77258d7;hpb=60f1b2e516e4ea7bfa581a77897ce1a8d21b3603;p=platform%2Fcore%2Fuifw%2Flibtdm.git diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec index a8f8003..afc3d6d 100644 --- a/packaging/libtdm.spec +++ b/packaging/libtdm.spec @@ -1,8 +1,8 @@ -%define UTEST_PACKAGE 1 -%define UTEST_GCOV 0 +%define HALTESTS_PACKAGE 1 +%define HALTESTS_GCOV 0 Name: libtdm -Version: 1.14.0 +Version: 2.9.2 Release: 0 Summary: User Library of Tizen Display Manager Group: Development/Libraries @@ -13,6 +13,7 @@ BuildRequires: pkgconfig(libtbm) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(ttrace) BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(iniparser) BuildRequires: pkgconfig(pixman-1) BuildRequires: gtest-devel @@ -46,12 +47,12 @@ Requires: libtdm-devel %description client-devel Tizen Display Manager Client Library headers -%if "%{UTEST_PACKAGE}" == "1" -%package utests +%if "%{HALTESTS_PACKAGE}" == "1" +%package haltests Summary: Tizen Display Manager unit tests package Group: Development/Libraries -%description utests +%description haltests Test module for testing libtdm APIs %endif @@ -70,19 +71,19 @@ This contains libtdm tools for fundamental testing cp %{SOURCE1001} . %build -UTEST="no" +HALTESTS="no" -%if "%{UTEST_PACKAGE}" == "1" -UTEST="yes" +%if "%{HALTESTS_PACKAGE}" == "1" +HALTESTS="yes" %endif -%if "%{UTEST_GCOV}" == "1" +%if "%{HALTESTS_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} \ +%reconfigure --disable-static --with-haltests=${HALTESTS} \ --with-tdm-data-path=%{TZ_SYS_RO_SHARE}/tdm \ CFLAGS="${CFLAGS} -Wall -Werror" \ CXXFLAGS="${CXXFLAGS} -Wall -Werror" \ @@ -97,6 +98,10 @@ rm -rf %{buildroot} install -m 644 service/tdm-socket-user.service %{buildroot}%{_unitdir_user} install -m 644 service/tdm-socket-user.path %{buildroot}%{_unitdir_user} +%__mkdir_p %{buildroot}%{_unitdir} +install -m 644 service/tdm-socket-user@.service %{buildroot}%{_unitdir} +install -m 644 service/tdm-socket-user@.path %{buildroot}%{_unitdir} + %remove_docs @@ -104,9 +109,13 @@ install -m 644 service/tdm-socket-user.path %{buildroot}%{_unitdir_user} %__mkdir_p %{_unitdir_user}/basic.target.wants ln -sf ../tdm-socket-user.path %{_unitdir_user}/basic.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_user}/basic.target.wants/tdm-socket-user.path +rm -f %{_unitdir}/user-basic@.target.wants/tdm-socket-user@.path %files %manifest %{name}.manifest @@ -114,9 +123,12 @@ rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path %license COPYING %{_libdir}/libtdm.so.* %{_libdir}/tdm/libtdm-dummy.so +%{_libdir}/tdm/libtdm-virtual.so %attr(750,root,root) %{_bindir}/tdm-monitor %{_unitdir_user}/tdm-socket-user.path %{_unitdir_user}/tdm-socket-user.service +%{_unitdir}/tdm-socket-user@.path +%{_unitdir}/tdm-socket-user@.service %files devel %manifest %{name}.manifest @@ -128,7 +140,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_config.h +%{_includedir}/tdm_deprecated.h %{_libdir}/pkgconfig/libtdm.pc %{_libdir}/libtdm.so @@ -151,10 +163,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 +%if "%{HALTESTS_PACKAGE}" == "1" +%files haltests %defattr(-,root,root,-) -%{_bindir}/tdm-utests +%{_bindir}/tdm-haltests %endif %changelog