X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fsensord.spec;h=b1439b8bf7ef191e0d59f40932a38e3bed6c42b3;hb=7e249a8b19cea3f6c11968942460eb75da382fb1;hp=490e90983a787820ffee4eb7ad2e0fabf1a61663;hpb=51888e9de655dab35f214a2a05d3bff60baf34cb;p=platform%2Fcore%2Fsystem%2Fsensord.git

diff --git a/packaging/sensord.spec b/packaging/sensord.spec
index 490e909..b1439b8 100644
--- a/packaging/sensord.spec
+++ b/packaging/sensord.spec
@@ -1,37 +1,25 @@
 Name:       sensord
 Summary:    Sensor daemon
-Version:    2.0.2
+Version:    2.0.8
 Release:    0
-Group:		System/Sensor Framework
+Group:      System/Sensor Framework
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1:	sensord.manifest
-Source2:	libsensord.manifest
+Source1:    sensord.service
+Source2:    sensord_command.socket
+Source3:    sensord_event.socket
 
 BuildRequires:  cmake
 BuildRequires:  libattr-devel
 BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(libsystemd-daemon)
-BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(cynara-creds-socket)
 BuildRequires:  pkgconfig(cynara-client)
 BuildRequires:  pkgconfig(cynara-session)
 Requires:   libsensord = %{version}-%{release}
 
-%define auto_rotation_state ON
-%define orientation_state OFF
-%define gravity_state OFF
-%define linear_accel_state OFF
-%define rv_state OFF
-%define geomagnetic_rv_state OFF
-%define gaming_rv_state OFF
-%define tilt_state OFF
-%define gyroscope_uncal_state OFF
-%define build_test_suite ON
-
 %description
 Sensor daemon
 
@@ -58,7 +46,6 @@ Group:      System/Development
 %description -n sensor-hal-devel
 Sensord HAL interface
 
-%if %{build_test_suite} == "ON"
 %package -n sensor-test
 Summary:    Sensord library
 Group:      System/Testing
@@ -66,21 +53,12 @@ Group:      System/Testing
 %description -n sensor-test
 Sensor functional testing
 
-%endif
-
 %prep
 %setup -q
-cp %{SOURCE1} .
-cp %{SOURCE2} .
-
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} \
-	-DORIENTATION=%{orientation_state} -DGRAVITY=%{gravity_state} \
-	-DLINEAR_ACCEL=%{linear_accel_state} -DRV=%{rv_state} \
-	-DGEOMAGNETIC_RV=%{geomagnetic_rv_state} -DGAMING_RV=%{gaming_rv_state} \
-	-DGYROSCOPE_UNCAL=%{gyroscope_uncal_state} -DAUTO_ROTATION=%{auto_rotation_state} \
-	-DTILT=%{tilt_state} -DTEST_SUITE=%{build_test_suite}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR=%{_libdir} \
+        -DMAJORVER=${MAJORVER} -DFULLVER=%{version}
 
 %build
 make %{?jobs:-j%jobs}
@@ -89,8 +67,15 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
+mkdir -p %{buildroot}%{_unitdir}
+
+install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}
+install -m 0644 %SOURCE2 %{buildroot}%{_unitdir}
+install -m 0644 %SOURCE3 %{buildroot}%{_unitdir}
+
 %install_service multi-user.target.wants sensord.service
-%install_service sockets.target.wants sensord.socket
+%install_service sockets.target.wants sensord_event.socket
+%install_service sockets.target.wants sensord_command.socket
 
 %post
 systemctl daemon-reload
@@ -98,23 +83,27 @@ systemctl daemon-reload
 %postun
 systemctl daemon-reload
 
-%post -n libsensord -p /sbin/ldconfig
+%post -n libsensord
+ln -sf %{_libdir}/libsensor.so.%{version} %{_libdir}/libsensor.so.1
+/sbin/ldconfig
 
-%postun -n libsensord -p /sbin/ldconfig
+%postun -n libsensord
+/sbin/ldconfig
 
 %files
-%attr(0644,root,root)/usr/etc/virtual_sensors.xml
-%manifest sensord.manifest
+%manifest packaging/sensord.manifest
 %{_bindir}/sensord
 %{_unitdir}/sensord.service
-%{_unitdir}/sensord.socket
+%{_unitdir}/sensord_command.socket
+%{_unitdir}/sensord_event.socket
 %{_unitdir}/multi-user.target.wants/sensord.service
-%{_unitdir}/sockets.target.wants/sensord.socket
+%{_unitdir}/sockets.target.wants/sensord_command.socket
+%{_unitdir}/sockets.target.wants/sensord_event.socket
 %license LICENSE.APLv2
 
 %files -n libsensord
 %defattr(-,root,root,-)
-%manifest libsensord.manifest
+%manifest packaging/libsensord.manifest
 %{_libdir}/libsensor.so.*
 %{_libdir}/libsensord-shared.so
 %license LICENSE.APLv2
@@ -129,9 +118,9 @@ systemctl daemon-reload
 %files -n sensor-hal-devel
 %defattr(-,root,root,-)
 %{_includedir}/sensor/sensor_hal.h
+%{_includedir}/sensor/sensor_hal_types.h
 %license LICENSE.APLv2
 
-%if %{build_test_suite} == "ON"
 %files -n sensor-test
 %defattr(-,root,root,-)
 %{_bindir}/api-test
@@ -140,4 +129,3 @@ systemctl daemon-reload
 %{_bindir}/multi-process-performance-test
 %{_bindir}/fusion-data-collection
 %license LICENSE.APLv2
-%endif