Accepting request 519435 from GNOME:Next

Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/519435
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/json-glib?expand=0&rev=65

json-glib-1.2.8.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a
-size 604336

json-glib-1.3.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6a80f42e63a3267356f20408bf91a1696837aa66d864ac7de2564ecbd332a7c
+size 162856

json-glib.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+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
 

json-glib.spec

@@ -18,17 +18,20 @@
 
 
 Name:           json-glib
-Version:        1.2.8
+Version:        1.3.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.3/%{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
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -108,27 +111,30 @@ json-glib library.
 %lang_package
 %prep
 %setup -q
+%if !0%{?is_opensuse}
 translation-update-upstream
+%endif
 
 %build
-%configure
+# These 2 options should work, but currently install fase fails.
-make %{?_smp_mflags}
+# 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 +143,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 +151,10 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/gir-1.0/*.gir
-%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/installed-tests
-%dir %{_datadir}/gtk-doc/html
+%dir %{_libexecdir}/installed-tests
-%{_datadir}/gtk-doc/html/%{name}
+%{_datadir}/installed-tests/json-glib-1.0/
+%{_libexecdir}/installed-tests/json-glib-1.0/
 
 %files lang -f %{name}-1.0.lang