Modify ttrace xml to make files included properly

The name of xml was 'trace' and it is renamed as 'ttrace'.
Also, the name of .pc file(ttrace.pc) is written explicitly.

Change-Id: I687c67a4bc5fa7f76862ece64872582910002733
Signed-off-by: SangYoun Kwak <sy.kwak@samsung.com>

diff --git a/packaging/hal-rootstrap.spec b/packaging/hal-rootstrap.spec
index 3818999109e66d9a272dd0252c291785c04465a3..166fad00920932f3e8bafae30deb653608677931 100644 (file)
--- a/packaging/hal-rootstrap.spec
+++ b/packaging/hal-rootstrap.spec
@@ -314,8 +314,6 @@ BuildRequires:      stt-devel
 BuildRequires: stt-engine-devel
 BuildRequires: tizen-core
 BuildRequires: tizen-core-devel
-BuildRequires: ttrace
-BuildRequires: ttrace-devel
 BuildRequires: tts
 BuildRequires: tts-devel
 BuildRequires: tts-engine-devel
@@ -394,6 +392,7 @@ BuildRequires:      pkgconfig(alsa)
 BuildRequires: pkgconfig(libusb-1.0)
 BuildRequires: pkgconfig(json-glib-1.0)
 BuildRequires: pkgconfig(libudev)
+BuildRequires: pkgconfig(ttrace)
 
 BuildRequires:  pkgconfig(hal-api-audio)
 BuildRequires:  pkgconfig(hal-api-bluetooth)

diff --git a/rs_resource/NativeAPI/trace-rs.xml b/rs_resource/NativeAPI/trace-rs.xml
deleted file mode 100644 (file)
index 48b485a..0000000
--- a/rs_resource/NativeAPI/trace-rs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<rootstrap name="trace">
-  <email>kihyuck.shin@samsung.com</email>
-  <email>joon.c.baek@samsung.com</email>
-  <email>eunjieji.lee@samsung.com</email>
-  <emulator>
-    <rpm accept="ttrace" arch="i686"/>
-    <rpm accept="ttrace-devel" arch="i686"/>
-  </emulator>
-  <target>
-    <rpm accept="ttrace" arch="armv7l"/>
-    <rpm accept="ttrace-devel" arch="armv7l"/>
-  </target>
-  <necessary>
-    <file>/usr/include/trace.h</file>
-    <file>/usr/lib/libttrace.so*</file>
-  </necessary>
-  <include_path>/usr/include</include_path>
-  <library_path>/usr/lib</library_path>
-  <library>libttrace.so</library>
-</rootstrap>

diff --git a/rs_resource/NativeAPI/ttrace-rs.xml b/rs_resource/NativeAPI/ttrace-rs.xml
new file mode 100644 (file)
index 0000000..5cb5349
--- /dev/null
+++ b/rs_resource/NativeAPI/ttrace-rs.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<rootstrap name="ttrace">
+  <email>kihyuck.shin@samsung.com</email>
+  <email>joon.c.baek@samsung.com</email>
+  <email>eunjieji.lee@samsung.com</email>
+  <emulator>
+    <rpm accept="ttrace" arch="i686"/>
+    <rpm accept="ttrace-devel" arch="i686"/>
+  </emulator>
+  <target>
+    <rpm accept="ttrace" arch="armv7l"/>
+    <rpm accept="ttrace-devel" arch="armv7l"/>
+  </target>
+
+  <pkgconfig>
+    <file>ttrace.pc</file>
+  </pkgconfig>
+
+  <necessary>
+    <file>/usr/include/trace.h</file>
+    <file>/usr/lib/libttrace.so*</file>
+  </necessary>
+  <include_path>/usr/include</include_path>
+  <library_path>/usr/lib</library_path>
+  <library>libttrace.so</library>
+</rootstrap>