Accepting request 583550 from GNOME:Next

Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/583550
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/dconf?expand=0&rev=97

dconf.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dconf
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,29 +17,29 @@
 
 
 Name:           dconf
-Version:        0.26.1
+Version:        0.27.1
 Release:        0
 Summary:        Simple key-based configuration system
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          System/Libraries
-Url:            https://live.gnome.org/dconf
-Source:         https://download.gnome.org/sources/dconf/0.26/%{name}-%{version}.tar.xz
+URL:            https://live.gnome.org/dconf
+Source:         http://download.gnome.org/sources/dconf/0.27/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM 0001-gvdb-Restore-permissions-on-changed-files.patch bsc#1025721 bsc#971074 bgo#758066 fezhang@suse.com -- Restore permissions on files changed by dconf update.
 Patch0:         0001-gvdb-Restore-permissions-on-changed-files.patch
 # For directory ownership
 BuildRequires:  dbus-1
 BuildRequires:  docbook-xsl-stylesheets
+BuildRequires:  gtk-doc
 BuildRequires:  intltool >= 0.50.0
+BuildRequires:  meson
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  vala >= 0.18.0
 BuildRequires:  xsltproc
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.44.0
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
-%if 0%{?BUILD_FROM_VCS}
-BuildRequires:  gtk-doc
-%endif
 # dconf provides a dbus service, but has no dependency on dbus in any way
 # (because it uses gdbus), so we need an explicit Requires
 Requires:       dbus-1
@@ -69,7 +69,7 @@ Group:          System/Libraries
 Requires:       %{name} >= %{version}
 # We really want this to be used as the default GSettings backend
 Supplements:    libgio-2_0-0
-%glib2_gio_module_requires
+%{glib2_gio_module_requires}
 
 %description -n gsettings-backend-dconf
 dconf is a low-level configuration system. Its main purpose is to
@@ -95,36 +95,28 @@ have configuration storage systems.
 %setup -q
 %patch0 -p1
 
-%if 0%{?BUILD_FROM_VCS}
-[ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
-%endif
-
 %build
-%configure \
-%if 0%{?BUILD_FROM_VCS}
-    --enable-gtk-doc
-%endif
+%meson \
+ -Denable-man=true \
+ -Denable-gtk-doc=true
 
-%__make V=1 %{?_smp_mflags}
+%meson_build
 
 %install
-%make_install
-find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
+%meson_install
 mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
 
 %post -n libdconf1 -p /sbin/ldconfig
-
 %postun -n libdconf1 -p /sbin/ldconfig
-
 %post -n gsettings-backend-dconf
-%glib2_gio_module_post
+%{glib2_gio_module_post}
 
 %postun -n gsettings-backend-dconf
-%glib2_gio_module_postun
+%{glib2_gio_module_postun}
 
 %files
-%defattr(-, root, root)
-%doc COPYING NEWS
+%license COPYING
+%doc NEWS
 # small utility to read values in the database
 %{_bindir}/dconf
 # service is needed for write
@@ -138,15 +130,12 @@ mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
 %{_sysconfdir}/dconf/
 
 %files -n libdconf1
-%defattr(-, root, root)
 %{_libdir}/libdconf.so.*
 
 %files -n gsettings-backend-dconf
-%defattr(-, root, root)
 %{_libdir}/gio/modules/libdconfsettings.so
 
 %files devel
-%defattr(-, root, root)
 %doc %{_datadir}/gtk-doc/html/dconf/
 %{_includedir}/dconf/
 %{_libdir}/libdconf.so