X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Flibtdm.spec;h=01fc06d34ae695c81578b7d37c2ba2e7cc5563f8;hb=93849965f9ce88f27cca9635dad0a00e14dc7b58;hp=3fc5591af6553d897ac5aaa3803d3e63b2351f4b;hpb=e315fbafc737fdcb044cba2a7f0c5b7d5a0820ee;p=platform%2Fcore%2Fuifw%2Flibtdm.git

diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec
index 3fc5591..01fc06d 100644
--- a/packaging/libtdm.spec
+++ b/packaging/libtdm.spec
@@ -2,7 +2,7 @@
 %define HALTESTS_GCOV    0
 
 Name:           libtdm
-Version:        2.8.6
+Version:        3.1.4
 Release:        0
 Summary:        User Library of Tizen Display Manager
 Group:          Development/Libraries
@@ -16,6 +16,7 @@ BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(pixman-1)
+BuildRequires:  pkgconfig(hal-api-tdm)
 BuildRequires:  gtest-devel 
 
 %description
@@ -83,7 +84,8 @@ CXXFLAGS+=" -fprofile-arcs -ftest-coverage -DTIZEN_TEST_GCOV"
 LDFLAGS+=" -lgcov"
 %endif
 
-%reconfigure --disable-static --with-haltests=${HALTESTS} \
+%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" \
@@ -98,10 +100,6 @@ 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
 
 
@@ -109,13 +107,30 @@ install -m 644 service/tdm-socket-user@.path %{buildroot}%{_unitdir}
 %__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
+%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
 
-%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
@@ -124,11 +139,9 @@ rm -f %{_unitdir}/user-basic@.target.wants/tdm-socket-user@.path
 %{_libdir}/libtdm.so.*
 %{_libdir}/tdm/libtdm-dummy.so
 %{_libdir}/tdm/libtdm-virtual.so
-%attr(750,root,root) %{_bindir}/tdm-monitor
+%attr(750,root,root) %{_bindir}/hal/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
@@ -160,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 "%{HALTESTS_PACKAGE}" == "1"
 %files haltests
 %defattr(-,root,root,-)
-%{_bindir}/tdm-haltests
+%{_bindir}/hal/tdm-haltests
 %endif
 
 %changelog