X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Flibtdm.spec;h=bdf15674e62cf6a11e147172829a8bc6d054bdd0;hb=afbef371013e66c1bd9d5037581bda76eccc7d4e;hp=8da544632541492a53801070638844396bfebc17;hpb=2484b6ea5e66518ee179e1c780793cbf8b5e885b;p=platform%2Fcore%2Fuifw%2Flibtdm.git

diff --git a/packaging/libtdm.spec b/packaging/libtdm.spec
index 8da5446..bdf1567 100644
--- a/packaging/libtdm.spec
+++ b/packaging/libtdm.spec
@@ -1,7 +1,7 @@
-%bcond_with utest
+%define UTEST_PACKAGE 1
 
 Name:           libtdm
-Version:        1.6.4
+Version:        1.10.3
 Release:        0
 Summary:        User Library of Tizen Display Manager
 Group:          Development/Libraries
@@ -13,10 +13,7 @@ BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(ttrace)
 BuildRequires:  pkgconfig(wayland-server)
 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 +44,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,28 +70,20 @@ cp %{SOURCE1001} .
 %build
 UTEST="no"
 
-%if %{with utest}
+%if "%{UTEST_PACKAGE}" == "1"
 UTEST="yes"
 %endif
 
-%reconfigure --disable-static --with-utest=${UTEST} \
+%reconfigure --disable-static --with-utests=${UTEST} \
              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}
-mkdir -p %{buildroot}/%{TZ_SYS_RO_SHARE}/license
-cp -af COPYING %{buildroot}/%{TZ_SYS_RO_SHARE}/license/%{name}
 %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}
@@ -94,31 +92,22 @@ 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
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{TZ_SYS_RO_SHARE}/license/%{name}
+%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
@@ -136,7 +125,7 @@ rm -f %{_unitdir_user}/basic.target.wants/tdm-socket-user.path
 %files client
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{TZ_SYS_RO_SHARE}/license/%{name}
+%license COPYING
 %{_libdir}/libtdm-client.so.*
 
 %files client-devel
@@ -152,4 +141,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