diff --git a/json-glib-1.2.8.tar.xz b/json-glib-1.2.8.tar.xz deleted file mode 100644 index 2d3e5b9..0000000 --- a/json-glib-1.2.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a -size 604336 diff --git a/json-glib-1.4.2.tar.xz b/json-glib-1.4.2.tar.xz new file mode 100644 index 0000000..1d2c714 --- /dev/null +++ b/json-glib-1.4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8 +size 163576 diff --git a/json-glib.changes b/json-glib.changes index d9c9f17..5337ef1 100644 --- a/json-glib.changes +++ b/json-glib.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Tue Sep 12 21:37:26 UTC 2017 - dimstar@opensuse.org + +- Update to version 1.4.2: + + Literally no change, just a re-released tarball. The tarball + generated for 1.4.0 and pushed to download.gnome.org comes from + a different commit. + +------------------------------------------------------------------- +Tue Sep 12 10:00:44 UTC 2017 - dimstar@opensuse.org + +- Update to version 1.4.0: + + Update the linker flags on macOS (bgo#785053). + + Change the build configuration options to better fit with + Meson. + + Updated translations. + +------------------------------------------------------------------- +Mon Sep 11 15:52:44 UTC 2017 - jengelh@inai.de + +- Trim descriptions a little. Update summaries. + +------------------------------------------------------------------- +Tue Jul 18 10:20:33 UTC 2017 - zaitor@opensuse.org + +- Update to version 1.3.2: + + Use Meson as the only build system. + + Bugs fixed: bgo#773504, bgo##780550, bgo#769206, bgo#766281, + bgo#758580, bgo#768788, bgo#774688. +- Conditionally apply translations-update-upstream BuildRequires + and macro for non-openSUSE only. +- Add meson BuildRequires and switch autotools macros configure, + make and makeinstall to meson, meson_build and meson_install + following upstream switch to Meson build system. + ------------------------------------------------------------------- Sun Mar 19 06:59:19 UTC 2017 - zaitor@opensuse.org diff --git a/json-glib.spec b/json-glib.spec index ae0d56d..4182902 100644 --- a/json-glib.spec +++ b/json-glib.spec @@ -18,23 +18,22 @@ Name: json-glib -Version: 1.2.8 +Version: 1.4.2 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 +Source0: http://download.gnome.org/sources/json-glib/1.4/%{name}-%{version}.tar.xz Source99: baselibs.conf BuildRequires: glib2-devel >= 2.46 BuildRequires: gobject-introspection-devel +BuildRequires: meson +%if !0%{?is_opensuse} BuildRequires: translation-update-upstream -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%endif %description -JSON is a lightweight data-interchange format.It is easy for humans to -read and write. It is easy 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. @@ -48,12 +47,12 @@ JSON data streams. Summary: Library for JavaScript Object Notation format # To make lang subpackage installable Group: Development/Libraries/C and C++ -Provides: %{name} = %{version} Recommends: %{name}-lang +Provides: %{name} = %{version} %description -n libjson-glib-1_0-0 -JSON is a lightweight data-interchange format.It is easy for humans to -read and write. It is easy for machines to parse and generate. +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 @@ -65,70 +64,58 @@ GObject classes for direct serialization into, and deserialization from, JSON data streams. %package -n typelib-1_0-Json-1_0 -Summary: Library for JavaScript Object Notation format -- Introspection bindings +Summary: Introspection bindings for libjson-glib Group: System/Libraries %description -n typelib-1_0-Json-1_0 -JSON is a lightweight data-interchange format.It is easy for humans to -read and write. It is easy 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. - This package provides the GObject Introspection bindings for JSON-GLib. %package devel -Summary: Library for JavaScript Object Notation format - Development Files +Summary: Development files for libjson-glib Group: Development/Libraries/C and C++ Requires: libjson-glib-1_0-0 = %{version} Requires: typelib-1_0-Json-1_0 = %{version} %description devel -JSON is a lightweight data-interchange format.It is easy for humans to -read and write. It is easy 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. - This package contains development files needed to develop with the json-glib library. %lang_package + %prep %setup -q +%if !0%{?is_opensuse} translation-update-upstream +%endif %build -%configure -make %{?_smp_mflags} +# These 2 options should work, but currently install fase fails. +# FIXME -Denable-man=true \ +# FIXME -Denable-gtk-doc=true \ +%meson \ + %{nil} +%meson_build %install -%make_install +%meson_install find %{buildroot}%{_libdir} -name '*.la' -delete -print %find_lang %{name}-1.0 -%clean -rm -rf %{buildroot} - %post -n libjson-glib-1_0-0 -p /sbin/ldconfig %postun -n libjson-glib-1_0-0 -p /sbin/ldconfig %files -n libjson-glib-1_0-0 %defattr(-,root,root) -%doc ChangeLog COPYING NEWS +%doc COPYING %{_libdir}/*.so.* %files -n typelib-1_0-Json-1_0 @@ -137,6 +124,7 @@ rm -rf %{buildroot} %files devel %defattr(-,root,root) +%doc NEWS README.md # Those could potentially be split in a -tools package, but are never used by non-devs. %{_bindir}/json-glib-format %{_bindir}/json-glib-validate @@ -144,9 +132,10 @@ rm -rf %{buildroot} %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_datadir}/gir-1.0/*.gir -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/%{name} +%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