X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fsensord.spec;h=8ae48ac614c2075ce9d10fce6c10bda7bbb2ce29;hb=4d8c46c48f5d04b8a3355714ccc2d42154ca836e;hp=4289d7bbb9342b4ba9154dfbf054a834ed74d035;hpb=acc8b4c7ce13c7daaf096c7c406612ad313f3720;p=platform%2Fcore%2Fsystem%2Fsensord.git

diff --git a/packaging/sensord.spec b/packaging/sensord.spec
old mode 100755
new mode 100644
index 4289d7b..8ae48ac
--- a/packaging/sensord.spec
+++ b/packaging/sensord.spec
@@ -1,6 +1,6 @@
 Name:       sensord
 Summary:    Sensor daemon
-Version:    1.0.0
+Version:    2.0.0
 Release:    0
 Group:     	System/Sensor Framework
 License:    Apache-2.0
@@ -9,7 +9,6 @@ Source1:	sensord.manifest
 Source2:	libsensord.manifest
 
 BuildRequires:  cmake
-BuildRequires:  vconf-keys-devel
 BuildRequires:  libattr-devel
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(libxml-2.0)
@@ -17,52 +16,44 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  pkgconfig(capi-system-info)
-
-%define accel_state ON
-%define gyro_state ON
-%define proxi_state ON
-%define light_state ON
-%define geo_state ON
-%define pressure_state ON
-%define temperature_state ON
-%define orientation_state ON
-%define gravity_state ON
-%define linear_accel_state ON
-%define rv_state ON
-%define build_test_suite OFF
+BuildRequires:  pkgconfig(cynara-creds-socket)
+BuildRequires:  pkgconfig(cynara-client)
+BuildRequires:  pkgconfig(cynara-session)
+Requires:   libsensord = %{version}-%{release}
+
+%define auto_rotation_state OFF
+%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
 
-%package sensord
-Summary:    Sensor daemon
-Group:      System/Sensor Framework
-Requires:   %{name} = %{version}-%{release}
-
-%description sensord
-Sensor daemon
-
 %package -n libsensord
 Summary:    Sensord library
 Group:      System/Libraries
-Requires:   %{name} = %{version}-%{release}
 
 %description -n libsensord
 Sensord library
 
 %package -n libsensord-devel
-Summary:    Sensord library (devel)
+Summary:    Sensord shared library
 Group:      System/Development
-Requires:   %{name} = %{version}-%{release}
+Requires:   libsensord = %{version}-%{release}
 
 %description -n libsensord-devel
-Sensord library (devel)
+Sensord shared library
 
 %if %{build_test_suite} == "ON"
 %package -n sensor-test
 Summary:    Sensord library
 Group:      System/Testing
-Requires:   %{name} = %{version}-%{release}
 
 %description -n sensor-test
 Sensor functional testing
@@ -74,12 +65,12 @@ Sensor functional testing
 cp %{SOURCE1} .
 cp %{SOURCE2} .
 
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DACCEL=%{accel_state} \
-	-DGYRO=%{gyro_state} -DPROXI=%{proxi_state} -DLIGHT=%{light_state} \
-	-DGEO=%{geo_state} -DPRESSURE=%{pressure_state} -DTEMPERATURE=%{temperature_state} \
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DORIENTATION=%{orientation_state} -DGRAVITY=%{gravity_state} \
 	-DLINEAR_ACCEL=%{linear_accel_state} -DRV=%{rv_state} \
-	-DTEST_SUITE=%{build_test_suite} \
+	-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} \
 	-DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir}
 
 %build
@@ -102,9 +93,7 @@ systemctl daemon-reload
 
 %postun -n libsensord -p /sbin/ldconfig
 
-%files -n sensord
-%attr(0644,root,root)/usr/etc/sensor_plugins.xml
-%attr(0644,root,root)/usr/etc/sensors.xml
+%files
 %attr(0644,root,root)/usr/etc/virtual_sensors.xml
 %manifest sensord.manifest
 %{_bindir}/sensord
@@ -113,42 +102,29 @@ systemctl daemon-reload
 %{_unitdir}/multi-user.target.wants/sensord.service
 %{_unitdir}/sockets.target.wants/sensord.socket
 %license LICENSE.APLv2
-%{_datadir}/license/sensord
 
 %files -n libsensord
 %defattr(-,root,root,-)
 %manifest libsensord.manifest
 %{_libdir}/libsensor.so.*
-%{_libdir}/sensord/*.so*
-%{_libdir}/libsensord-share.so
-%{_libdir}/libsensord-server.so
+%{_libdir}/libsensord-devel.so
 %license LICENSE.APLv2
-%{_datadir}/license/libsensord
 
 %files -n libsensord-devel
 %defattr(-,root,root,-)
 %{_includedir}/sensor/*.h
-%{_includedir}/sf_common/*.h
+%{_includedir}/sensord-devel/*.h
 %{_libdir}/libsensor.so
 %{_libdir}/pkgconfig/sensor.pc
-%{_libdir}/pkgconfig/sf_common.pc
-%{_libdir}/pkgconfig/sensord-server.pc
+%license LICENSE.APLv2
 
 %if %{build_test_suite} == "ON"
 %files -n sensor-test
 %defattr(-,root,root,-)
-%{_bindir}/accelerometer
-%{_bindir}/geomagnetic
-%{_bindir}/orientation
-%{_bindir}/gravity
-%{_bindir}/linear_acceleration
-%{_bindir}/gyro
-%{_bindir}/proxi
-%{_bindir}/pressure
-%{_bindir}/temperature
-%{_bindir}/light
-%{_bindir}/rotation_vector
+%{_bindir}/api-test
+%{_bindir}/sensor-test
+%{_bindir}/multi-thread-performance-test
+%{_bindir}/multi-process-performance-test
+%{_bindir}/fusion-data-collection
 %license LICENSE.APLv2
-%{_datadir}/license/test
 %endif
-