Modify json-glib xml to make files included properly

Previously, the <necessary> section of json-glib-rs.xml was just an
asterisk("*"), which cannot be used in hal rootstrap.
To make hal rootstrap include the files of json-glib, necessary files
are added to the <necessary> list.
Also, the BuildRequire for json-glib is changed to use 'pkgconfig'.

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

diff --git a/packaging/hal-rootstrap.spec b/packaging/hal-rootstrap.spec
index fbed4c1..8060d08 100644 (file)
--- a/packaging/hal-rootstrap.spec
+++ b/packaging/hal-rootstrap.spec
@@ -350,8 +350,6 @@ BuildRequires:      libgobject
 BuildRequires: libgthread
 BuildRequires: libharfbuzz
 BuildRequires: harfbuzz-devel
-BuildRequires: libjson-glib
-BuildRequires: json-glib-devel
 BuildRequires: kernel-headers
 BuildRequires: libexif
 BuildRequires: libexif-devel
@@ -394,6 +392,7 @@ BuildRequires:      zlib-devel
 
 BuildRequires: pkgconfig(alsa)
 BuildRequires: pkgconfig(libusb-1.0)
+BuildRequires: pkgconfig(json-glib-1.0)
 
 BuildRequires:  pkgconfig(hal-api-audio)
 BuildRequires:  pkgconfig(hal-api-bluetooth)

diff --git a/rs_resource/OSS/json-glib-rs.xml b/rs_resource/OSS/json-glib-rs.xml
index 39af076..7bd1acc 100644 (file)
--- a/rs_resource/OSS/json-glib-rs.xml
+++ b/rs_resource/OSS/json-glib-rs.xml
@@ -8,10 +8,27 @@
     <rpm accept="libjson-glib" arch="armv7l"/>
     <rpm accept="json-glib-devel" arch="armv7l"/>
   </target>
+
+  <pkgconfig>
+    <file>json-glib-1.0.pc</file>
+  </pkgconfig>
+
   <necessary>
-    <file>*</file>
+    <file>/usr/include/json-glib-1.0/json-glib/json-builder.h</file>
+    <file>/usr/include/json-glib-1.0/json-glib/json-enum-types.h</file>
+    <file>/usr/include/json-glib-1.0/json-glib/json-generator.h</file>
+    <file>/usr/include/json-glib-1.0/json-glib/json-glib.h</file>
+    <file>/usr/include/json-glib-1.0/json-glib/json-gobject.h</file>
+    <file>/usr/include/json-glib-1.0/json-glib/json-gvariant.h</file>
+    <file>/usr/include/json-glib-1.0/json-glib/json-parser.h</file>
+    <file>/usr/include/json-glib-1.0/json-glib/json-path.h</file>
+    <file>/usr/include/json-glib-1.0/json-glib/json-reader.h</file>
+    <file>/usr/include/json-glib-1.0/json-glib/json-types.h</file>
+    <file>/usr/include/json-glib-1.0/json-glib/json-utils.h</file>
+    <file>/usr/include/json-glib-1.0/json-glib/json-version.h</file>
+    <file>/usr/include/json-glib-1.0/json-glib/json-version-macros.h</file>
+    <file>/usr/lib/libjson-glib-1.0.so</file>
+    <file>/usr/lib/libjson-glib-1.0.so.0</file>
+    <file>/usr/lib/libjson-glib-1.0.so.0.800.0</file>
   </necessary>
-  <include_path>/usr/include/json-glib-1.0</include_path>
-  <library_path>/usr/lib</library_path>
-  <library>libjson-glib-1.0.so</library>
 </rootstrap>