From dd2d3c4246e8643234cf17e266ee4517b66a4197 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Fri, 30 Sep 2016 14:12:46 +1000 Subject: [PATCH 1/4] New version 1.2.2 Split typelib from shared library package --- .abf.yml | 2 +- json-glib.spec | 95 +++++++++++++++++++++++++++++--------------------- 2 files changed, 57 insertions(+), 40 deletions(-) diff --git a/.abf.yml b/.abf.yml index b1a7d03..01dabf0 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - json-glib-1.0.4.tar.xz: efdf5a66d1d8fb504448a40ba2352bbfef301074 + json-glib-1.2.2.tar.xz: f7a25ab5eaba4ae2027276784223fbf55ef0619f diff --git a/json-glib.spec b/json-glib.spec index e0bf0c1..8c4c2f1 100644 --- a/json-glib.spec +++ b/json-glib.spec @@ -1,76 +1,93 @@ -%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.2.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: 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}/* + +#---------------------------------------------------------------------------- + %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 ChangeLog +%{_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 + +#---------------------------------------------------------------------------- + %prep %setup -q %build -%configure2_5x --disable-static -%make - +%configure2_5x \ + --disable-static \ + --disable-man +%make %install -rm -rf %{buildroot} %makeinstall_std -%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 From b184fcd73e0d27267328c25f24b54b8296449238 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Fri, 14 Oct 2016 21:21:28 +0400 Subject: [PATCH 2/4] MassBuild#1169: Increase release tag --- json-glib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json-glib.spec b/json-glib.spec index 8c4c2f1..0bf85c2 100644 --- a/json-glib.spec +++ b/json-glib.spec @@ -7,7 +7,7 @@ Summary: Library for JavaScript Object Notation format Name: json-glib Version: 1.2.2 -Release: 1 +Release: 2 License: LGPLv2+ Group: System/Libraries Url: http://live.gnome.org/JsonGlib From 7253d30c68a01e24f214e2a88b89520981954ab8 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sat, 4 Feb 2017 18:35:21 +0300 Subject: [PATCH 3/4] MassBuild#1230: Increase release tag --- json-glib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json-glib.spec b/json-glib.spec index 0bf85c2..4510652 100644 --- a/json-glib.spec +++ b/json-glib.spec @@ -7,7 +7,7 @@ Summary: Library for JavaScript Object Notation format Name: json-glib Version: 1.2.2 -Release: 2 +Release: 3 License: LGPLv2+ Group: System/Libraries Url: http://live.gnome.org/JsonGlib From 42961b1b3f9d3f1df59619b8e787534ee586ddd1 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 12 Feb 2018 21:36:41 +1000 Subject: [PATCH 4/4] 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 -