X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Flibtdm.spec;h=01fc06d34ae695c81578b7d37c2ba2e7cc5563f8;hb=18c786cd7156183f5ccae1676725a350943867cf;hp=226fcc0b3c2f98041380cc5f849f96b76241eb57;hpb=18692b83856bce6d37967718f3258201bcd58220;p=platform%2Fcore%2Fuifw%2Flibtdm.git

diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec
index 226fcc0..01fc06d 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.13.0
+Version:        3.1.4
 Release:        0
 Summary:        User Library of Tizen Display Manager
 Group:          Development/Libraries
@@ -13,7 +13,10 @@ 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:  pkgconfig(hal-api-tdm)
 BuildRequires:  gtest-devel 
 
 %description
@@ -45,12 +48,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
 
@@ -69,19 +72,21 @@ 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} --bindir=%{_bindir}/hal \
+             --with-default-dlog=yes \
+             --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"
@@ -102,7 +107,28 @@ 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/
 
-%post -p /sbin/ldconfig
+%post
+%if "%{HALTESTS_PACKAGE}" == "1"
+if [ -f %{_bindir}/tdm-haltests ]; then
+    rm -f %{_bindir}/tdm-haltests
+fi
+ln -s %{_bindir}/hal/tdm-haltests %{_bindir}/tdm-haltests
+%endif
+if [ -f %{_bindir}/tdm-monitor ]; then
+    rm -f %{_bindir}/tdm-monitor
+fi
+ln -s %{_bindir}/hal/tdm-monitor %{_bindir}/tdm-monitor
+
+if [ -f %{_bindir}/tdm-test-client ]; then
+    rm -f %{_bindir}/tdm-test-client
+fi
+ln -s %{_bindir}/hal/tdm-test-client %{_bindir}/tdm-test-client
+
+if [ -f %{_bindir}/tdm-test-server ]; then
+    rm -f %{_bindir}/tdm-test-server
+fi
+ln -s %{_bindir}/hal/tdm-test-server %{_bindir}/tdm-test-server
+
 %postun -p /sbin/ldconfig
 rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
 
@@ -112,7 +138,8 @@ rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
 %license COPYING
 %{_libdir}/libtdm.so.*
 %{_libdir}/tdm/libtdm-dummy.so
-%attr(750,root,root) %{_bindir}/tdm-monitor
+%{_libdir}/tdm/libtdm-virtual.so
+%attr(750,root,root) %{_bindir}/hal/tdm-monitor
 %{_unitdir_user}/tdm-socket-user.path
 %{_unitdir_user}/tdm-socket-user.service
 
@@ -126,6 +153,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
 
@@ -145,13 +173,13 @@ rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
 
 %files tools
 %manifest %{name}.manifest
-%attr(750,root,root) %{_bindir}/tdm-test-server
-%{_bindir}/tdm-test-client
+%attr(750,root,root) %{_bindir}/hal/tdm-test-server
+%{_bindir}/hal/tdm-test-client
 
-%if "%{UTEST_PACKAGE}" == "1"
-%files utests
+%if "%{HALTESTS_PACKAGE}" == "1"
+%files haltests
 %defattr(-,root,root,-)
-%{_bindir}/tdm-utests
+%{_bindir}/hal/tdm-haltests
 %endif
 
 %changelog