diff --git a/.abf.yml b/.abf.yml index b1a7d03..f58b12b 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - json-glib-1.0.4.tar.xz: efdf5a66d1d8fb504448a40ba2352bbfef301074 + json-glib-1.4.2.tar.xz: 660a72e0269feb15e89d6c17d86e594b7af6fecb diff --git a/json-glib.spec b/json-glib.spec index e0bf0c1..8d83c00 100644 --- a/json-glib.spec +++ b/json-glib.spec @@ -1,76 +1,96 @@ -%define libver 1.0 +%define api 1.0 %define major 0 +%define libname %mklibname %{name} %{api} %{major} +%define girname %mklibname %{name}-gir %{api} +%define devname %mklibname %{name} -d -%define libname %mklibname %{name} %{libver} %{major} -%define develname %mklibname %{name} -d - -Name: json-glib -Version: 1.0.4 -Release: 1 Summary: Library for JavaScript Object Notation format -Group: System/Libraries +Name: json-glib +Version: 1.4.2 +Release: 1 License: LGPLv2+ -URL: http://live.gnome.org/JsonGlib -Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}.tar.xz +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) -BuildRequires: gtk-doc -Requires: %{libname} = %{version}-%{release} %description %{name} is a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format. +%files -f %{name}-%{api}.lang +%{_bindir}/json-glib-format +%{_bindir}/json-glib-validate +%{_mandir}/man1/json-glib-format.1* +%{_mandir}/man1/json-glib-validate.1* + +#---------------------------------------------------------------------------- + %package -n %{libname} Summary: Shared libraries for %{name} Group: System/Libraries -Provides: %{name} = %{version}-%{release} -Provides: lib%{name} = %{version}-%{release} %description -n %{libname} %{name} is a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format. +%files -n %{libname} +%{_libdir}/lib%{name}-%{api}.so.%{major}* -%package -n %{develname} +#---------------------------------------------------------------------------- + +%package -n %{girname} +Summary: GObject introspection interface library for %{name} +Group: System/Libraries +Requires: %{libname} = %{EVRD} +Conflicts: %{_lib}json-gliblib1.0_0 < 1.2.2 + +%description -n %{girname} +GObject introspection interface library for %{name}. + +%files -n %{girname} +%{_libdir}/girepository-1.0/Json-%{api}.typelib + +#---------------------------------------------------------------------------- + +%package -n %{devname} Summary: Development files for %{name} Group: Development/C -Provides: lib%{name}-devel = %{version}-%{release} -Requires: %{libname} = %{version}-%{release} +Requires: %{libname} = %{EVRD} +Requires: %{girname} = %{EVRD} +Provides: %{name}-devel = %{EVRD} -%description -n %{develname} -The %{develname} package contains libraries and header files for +%description -n %{devname} +The %{devname} package contains libraries and header files for developing applications that use %{name}. +%files -n %{devname} +%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/ + +#---------------------------------------------------------------------------- + %prep %setup -q %build -%configure2_5x --disable-static -%make - +%meson \ + -Ddocs=true +%meson_build %install -rm -rf %{buildroot} -%makeinstall_std +%meson_install -%find_lang %{name}-%{libver} +%find_lang %{name}-%{api} -%check -%make check - -%files -f %{name}-%{libver}.lang -%{_bindir}/* - -%files -n %{libname} -%{_libdir}/lib%{name}-%{libver}.so.%{major}* -%_libdir/girepository-1.0/Json-%{libver}.typelib - -%files -n %{develname} -%doc NEWS ChangeLog -%{_libdir}/lib%{name}-%{libver}.so -%{_libdir}/pkgconfig/%{name}-%{libver}.pc -%{_includedir}/%{name}-%{libver}/ -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/%{name}/ -%{_datadir}/gir-1.0/Json-%{libver}.gir