Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'update_to_160' into 'master'
[json-glib] Update to version 1.6.0. Fixes JB#51594

See merge request mer-core/json-glib!4
  • Loading branch information
xfade committed Oct 15, 2020
2 parents 6ff733c + c7489e1 commit acfb5c2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "upstream"]
path = upstream
url = https://gitlab.gnome.org/GNOME/json-glib.git
url = https://git.sailfishos.org/mirror/json-glib.git
10 changes: 6 additions & 4 deletions rpm/json-glib.spec
@@ -1,14 +1,16 @@
Name: json-glib
Summary: Library for JavaScript Object Notation format
Version: 1.5.2
Version: 1.6.0
Release: 1
License: LGPLv2+
URL: https://wiki.gnome.org/Projects/JsonGlib
Source0: %{name}-%{version}.tar.bz2
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: gobject-introspection-devel
BuildRequires: meson
BuildRequires: meson >= 0.52.0
BuildRequires: gettext
BuildRequires: python3-base
BuildRequires: pkgconfig(gio-2.0) >= 2.54.0
BuildRequires: pkgconfig(glib-2.0) >= 2.54.0
BuildRequires: pkgconfig(gobject-introspection-1.0)
Obsoletes: libjson-glib
Conflicts: libjson-glib

Expand Down
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated from 63411d to 760a2e

0 comments on commit acfb5c2

Please sign in to comment.