Bump to json-glib 1.6.0

Change-Id: Ie059292f377f93cf5afbf8b51623890d6d6d1d66
Signed-off-by: JinWang An <jinwang.an@samsung.com>

diff --git a/json-glib/meson.build b/json-glib/meson.build
index 70c3171..2d05bb6 100644 (file)
--- a/json-glib/meson.build
+++ b/json-glib/meson.build
@@ -136,6 +136,7 @@ foreach t: tools
 
   executable(bin_name, bin_sources,
              c_args: json_c_args,
+             link_args: '-pie',
              dependencies: json_glib_dep,
              install: true)
 endforeach

diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build
index 7fdbc3f..853edda 100644 (file)
--- a/json-glib/tests/meson.build
+++ b/json-glib/tests/meson.build
@@ -45,6 +45,7 @@ foreach t: tests
   exe = executable(
     t, '@0@.c'.format(t),
     c_args: json_c_args,
+    link_args: '-pie',
     install: true,
     install_dir: installed_test_bindir,
     dependencies: [ json_glib_dep, ],

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
new file mode 100644 (file)
index 0000000..d85c0f0
--- /dev/null
+++ b/packaging/baselibs.conf
@@ -0,0 +1 @@
+libjson-glib

diff --git a/packaging/json-glib.manifest b/packaging/json-glib.manifest
new file mode 100644 (file)
index 0000000..93cab65
--- /dev/null
+++ b/packaging/json-glib.manifest
@@ -0,0 +1,8 @@
+<manifest>
+ <request>
+    <domain name="_"/>
+ </request>
+ <assign>
+   <filesystem path="/usr/bin/*" exec_label="none" />
+ </assign>
+</manifest>

diff --git a/packaging/json-glib.spec b/packaging/json-glib.spec
new file mode 100644 (file)
index 0000000..7db4a29
--- /dev/null
+++ b/packaging/json-glib.spec
@@ -0,0 +1,129 @@
+Name:           json-glib
+Version:        1.6.0
+Release:        0
+Summary:        Library for JavaScript Object Notation format
+License:        LGPL-2.1+
+Group:          Development/Libraries/C and C++
+Url:            http://live.gnome.org/JsonGlib
+Source0:        http://download.gnome.org/sources/json-glib/1.2/%{name}-%{version}.tar.xz
+Source99:       baselibs.conf
+Source1001:     json-glib.manifest
+BuildRequires:  gettext
+BuildRequires:  gobject-introspection-devel
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  meson
+
+%description
+JSON-GLib provides a parser and a generator GObject classes and various
+wrappers for the complex data types employed by JSON, such as arrays
+and objects.
+
+JSON-GLib uses GLib native data types and the generic value container
+GValue for ease of development. It also provides integration with the
+GObject classes for direct serialization into, and deserialization from,
+JSON data streams.
+
+%package -n libjson-glib
+Summary:        Library for JavaScript Object Notation format
+# To make lang subpackage installable
+Group:          Development/Libraries/C and C++
+Recommends:     %{name}-lang
+Provides:       %{name} = %{version}
+
+%description -n libjson-glib
+JSON is a lightweight data-interchange format. It is comparatively
+easy for humans to read and write, and for machines to parse and generate.
+
+JSON-GLib provides a parser and a generator GObject classes and various
+wrappers for the complex data types employed by JSON, such as arrays
+and objects.
+
+JSON-GLib uses GLib native data types and the generic value container
+GValue for ease of development. It also provides integration with the
+GObject classes for direct serialization into, and deserialization from,
+JSON data streams.
+
+%package -n typelib-Json
+Summary:        Introspection bindings for libjson-glib
+Group:          System/Libraries
+
+%description -n typelib-Json
+JSON-GLib provides a parser and a generator GObject classes and various
+wrappers for the complex data types employed by JSON, such as arrays
+and objects.
+
+This package provides the GObject Introspection bindings for JSON-GLib.
+
+%package devel
+Summary:        Development files for libjson-glib
+Group:          Development/Libraries/C and C++
+Requires:       libjson-glib = %{version}
+Requires:       typelib-Json = %{version}
+#BuildRequires:  gettext
+#BuildRequires:  gtk-doc
+
+%description devel
+JSON-GLib provides a parser and a generator GObject classes and various
+wrappers for the complex data types employed by JSON, such as arrays
+and objects.
+
+This package contains development files needed to develop with the
+json-glib library.
+
+%lang_package
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
+%build
+export CFLAGS+=" -fPIC"
+
+mkdir -p builddir
+meson --prefix /usr --libdir %{_libdir} builddir
+
+
+%check
+ninja -C builddir meson-test || exit 0
+
+%install
+DESTDIR=%{buildroot} ninja -C builddir install
+find %{buildroot}%{_libdir} -name '*.la' -delete -print
+%find_lang %{name}-1.0
+
+mv %{name}-1.0.lang %{name}.lang
+%__rm -rf %{buildroot}%{_datadir}/gtk-doc
+
+%post -n libjson-glib -p /sbin/ldconfig
+
+%postun -n libjson-glib -p /sbin/ldconfig
+
+%files -n libjson-glib
+%manifest %{name}.manifest
+%defattr(-,root,root)
+%{_bindir}/json-glib-format
+%{_bindir}/json-glib-validate
+%license COPYING
+%{_libdir}/*.so.*
+
+%files -n typelib-Json
+%manifest %{name}.manifest
+%defattr(-,root,root)
+%{_libdir}/girepository-1.0/Json-1.0.typelib
+
+%files devel
+%manifest %{name}.manifest
+%defattr(-,root,root)
+%{_includedir}/%{name}-1.0
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/gir-1.0/*.gir
+%dir %{_datadir}/installed-tests
+%dir %{_libexecdir}/installed-tests
+%{_datadir}/installed-tests/json-glib-1.0/
+%{_libexecdir}/installed-tests/json-glib-1.0/
+
+#%files lang -f %{name}-1.0.lang
+
+%changelog
+