common: code sync with Tizen 2.3

- Currently, libsvi is too old and it is necessary
  to add many fixes and some features. Thus code sync
  is needed

Change-Id: I0abd6ad42bf5ef74ae001a2c82aca5c6bc40ff32
Signed-off-by: taeyoung <ty317.kim@samsung.com>

5 files changed, 56 insertions, 70 deletions

diff --git a/packaging/libfeedback.changes b/packaging/libfeedback.changes
deleted file mode 100644
index 32f65c8..0000000
--- a/packaging/libfeedback.changes
+++ /dev/null
@@ -1,10 +0,0 @@
-* Fri Sep 27 2013 jy910.yun <jy910.yun@samsung.com> submit/tizen/20130913.132819@c1dfd9e
-- change the svi-data-sdk manifest file name
-- change the resource file locations to /opt/usr/share form /opt/share
-
-* Fri Sep 26 2013 jy910.yun <jy910.yun@samsung.com> submit/tizen/20130913.132819@7b034f3
-- add device_ops structure for improving feedback structure
-
-* Fri Jul 12 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> 763c4f2
-- Fix manifest installation
-
diff --git a/packaging/libfeedback.manifest b/packaging/libfeedback.manifest
index 017d22d..f13bba5 100644
--- a/packaging/libfeedback.manifest
+++ b/packaging/libfeedback.manifest
@@ -1,5 +1,9 @@
 <manifest>
- <request>
-    <domain name="_"/>
- </request>
+	<request>
+		<domain name="_"/>
+	</request>
+	<assign>
+		<filesystem path="/usr/bin/svi_test" exec_label="_"/>
+	</assign>
 </manifest>
+
diff --git a/packaging/libfeedback.spec b/packaging/libfeedback.spec
index fc87bb0..cdb110b 100644
--- a/packaging/libfeedback.spec
+++ b/packaging/libfeedback.spec
@@ -1,27 +1,27 @@
 Name:       libfeedback
 Summary:    Feedback library
 Version:    0.1.3
-Release:    0
+Release:    1
 Group:      System/Libraries
-License:    Apache-2.0
+License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1:        libsvi.manifest
-Source2:        libfeedback.manifest
-Source3:        svi-data.manifest
-Requires(post):   /sbin/ldconfig
+source1:	libfeedback.manifest
+source2:	svi-data.manifest
+Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(mm-keysound)
-BuildRequires:  pkgconfig(haptic)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(capi-base-common)
-BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(dbus-1)
+Requires(post):	svi-data
 
 %description
-Feedback library for playing sound, vibration and led
+Feedback library for playing sound and vibration
+
 
 %package -n libfeedback-devel
 Summary:    Feedback library for (devel)
@@ -29,85 +29,76 @@ Group:      Development/Libraries
 Requires:   libfeedback = %{version}-%{release}
 
 %description -n libfeedback-devel
-Feedback library for playing sound, vibration and led (devel)
-
-%package -n libsvi
-Summary:    SVI library
-Group:      Development/Libraries
-Requires:   libfeedback = %{version}-%{release}
-
-%description -n libsvi
-SVI library package
-
-%package -n libsvi-devel
-Summary:    SVI library for (devel)
-Group:      Development/Libraries
-Requires:   libsvi = %{version}-%{release}
-
-%description -n libsvi-devel
-SVI library (devel) package
+Feedback library for playing sound and vibration (devel)
 
 %package -n svi-data
-Summary:    SVI resource
-Group:      Development/Libraries
+Summary: 	svi resource package
+Group:		Development/Libraries
 
 %description -n svi-data
-SVI resource package
+svi resource package
 
 %prep
-%setup -q 
+%setup -q
 
 %build
+export CFLAGS+=" -DTIZEN_ENGINEER_MODE"
 cp %{SOURCE1} .
 cp %{SOURCE2} .
-cp %{SOURCE3} .
-%cmake .
-%__make
+
+%ifarch %{arm}
+%define ARCH arm
+%else
+%define ARCH emulator
+%endif
+
+%cmake \
+%if "%{?tizen_profile_name}" == "wearable"
+	-DMICRO_DD=YES \
+%endif
+	. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCH=%{ARCH}
+make
 
 %install
 rm -rf %{buildroot}
 %make_install
 
 mkdir -p %{buildroot}%{_datadir}/license
-cp LICENSE.APLv2 %{buildroot}%{_datadir}/license/%{name}
+cp LICENSE %{buildroot}/usr/share/license/%{name}
+cp LICENSE %{buildroot}/usr/share/license/svi-data
+
+mkdir -p %{buildroot}/opt/usr/share/feedback/haptic/custom
 
 %post -p /sbin/ldconfig
 
-%post -n libsvi -p /sbin/ldconfig
+%post -n svi-data
 
-%postun -n libsvi -p /sbin/ldconfig
+if [ -f %{_libdir}/rpm-plugins/msm.so ]; then
+	find /opt/usr/share/feedback/ | xargs chsmack -a 'svi-data'
+fi
 
 %postun -p /sbin/ldconfig
 
 %postun -n svi-data
 rm -rf %{_datadir}/feedback/
+rm -rf /opt/usr/share/feedback/
 
 %files
-%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libfeedback.so.*
 %{_datadir}/license/%{name}
+%manifest libfeedback.manifest
 
 %files -n libfeedback-devel
-%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/feedback/*.h
 %{_libdir}/libfeedback.so
 %{_libdir}/pkgconfig/feedback.pc
 
-%files -n libsvi
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_libdir}/libsvi.so.*
-
-%files -n libsvi-devel
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-%{_includedir}/svi/*.h
-%{_libdir}/libsvi.so
-%{_libdir}/pkgconfig/svi.pc
-
 %files -n svi-data
-%manifest %{name}.manifest
 %defattr(644,root,root,-)
 %{_datadir}/feedback/*
+%defattr(666,app,app,-)
+%dir /opt/usr/share/feedback/haptic/custom
+%{_datadir}/license/svi-data
+%manifest svi-data.manifest
diff --git a/packaging/libsvi.manifest b/packaging/libsvi.manifest
deleted file mode 100644
index 81ace0c..0000000
--- a/packaging/libsvi.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest>
-	<request>
-		<domain name="_"/>
-	</request>
-</manifest>
-
diff --git a/packaging/svi-data.manifest b/packaging/svi-data.manifest
index 97e8c31..9e74af7 100644
--- a/packaging/svi-data.manifest
+++ b/packaging/svi-data.manifest
@@ -1,4 +1,11 @@
 <manifest>
+	<define>
+		<domain name="svi-data"/>
+	</define>
+	<assign>
+		<filesystem path="/opt/usr/share/feedback/haptic/custom" label="svi-data" type="transmutable"/>
+		<filesystem path="/opt/usr/share/feedback/led/custom" label="svi-data" type="transmutable"/>
+	</assign>
 	<request>
 		<domain name="_"/>
 	</request>