From 42961b1b3f9d3f1df59619b8e787534ee586ddd1 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 12 Feb 2018 21:36:41 +1000 Subject: [PATCH] New version 1.4.2 Swicth to meson build system --- .abf.yml | 2 +- json-glib.spec | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.abf.yml b/.abf.yml index 01dabf0..f58b12b 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - json-glib-1.2.2.tar.xz: f7a25ab5eaba4ae2027276784223fbf55ef0619f + json-glib-1.4.2.tar.xz: 660a72e0269feb15e89d6c17d86e594b7af6fecb diff --git a/json-glib.spec b/json-glib.spec index 4510652..8d83c00 100644 --- a/json-glib.spec +++ b/json-glib.spec @@ -6,13 +6,15 @@ Summary: Library for JavaScript Object Notation format Name: json-glib -Version: 1.2.2 -Release: 3 +Version: 1.4.2 +Release: 1 License: LGPLv2+ Group: System/Libraries Url: http://live.gnome.org/JsonGlib Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}.tar.xz BuildRequires: gtk-doc +BuildRequires: meson +BuildRequires: xsltproc BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) @@ -21,7 +23,10 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) for the JavaScript Object Notation (JSON) format. %files -f %{name}-%{api}.lang -%{_bindir}/* +%{_bindir}/json-glib-format +%{_bindir}/json-glib-validate +%{_mandir}/man1/json-glib-format.1* +%{_mandir}/man1/json-glib-validate.1* #---------------------------------------------------------------------------- @@ -64,13 +69,15 @@ The %{devname} package contains libraries and header files for developing applications that use %{name}. %files -n %{devname} -%doc NEWS ChangeLog +%doc NEWS %{_libdir}/lib%{name}-%{api}.so %{_libdir}/pkgconfig/%{name}-%{api}.pc %{_includedir}/%{name}-%{api}/ %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/%{name}/ %{_datadir}/gir-1.0/Json-%{api}.gir +%{_datadir}/installed-tests/ +%{_libdir}/installed-tests/ #---------------------------------------------------------------------------- @@ -78,16 +85,12 @@ developing applications that use %{name}. %setup -q %build -%configure2_5x \ - --disable-static \ - --disable-man -%make +%meson \ + -Ddocs=true +%meson_build %install -%makeinstall_std +%meson_install %find_lang %{name}-%{api} -%check -%make check -