From af20d98e065f170a1f4216eedd64594b05b20d7932268f54a5928704f34620c7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Mar 2018 10:03:11 +0000 Subject: [PATCH] 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-0.26.1.tar.xz | 3 --- dconf-0.27.1.tar.xz | 3 +++ dconf.changes | 20 +++++++++++++++++++ dconf.spec | 47 +++++++++++++++++---------------------------- 4 files changed, 41 insertions(+), 32 deletions(-) delete mode 100644 dconf-0.26.1.tar.xz create mode 100644 dconf-0.27.1.tar.xz diff --git a/dconf-0.26.1.tar.xz b/dconf-0.26.1.tar.xz deleted file mode 100644 index 5ddde16..0000000 --- a/dconf-0.26.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d583b1f7fc93b879e2956acc6a26ea05a445a0002158aeef80c8e378e1414535 -size 218516 diff --git a/dconf-0.27.1.tar.xz b/dconf-0.27.1.tar.xz new file mode 100644 index 0000000..d6ae937 --- /dev/null +++ b/dconf-0.27.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37daf52e68d03ca0b6d0c2e0df7acac64e091074457ae306683b78b5cfa7e9ce +size 99996 diff --git a/dconf.changes b/dconf.changes index 06a8253..9948dc3 100644 --- a/dconf.changes +++ b/dconf.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Feb 28 16:24:35 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + +------------------------------------------------------------------- +Wed Oct 18 15:36:44 UTC 2017 - badshah400@gmail.com + +- Update to version 0.27.1: + + Port to meson build system. +- 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. +- Drop the BUILD_FROM_VCS checks, and build gtk-doc + unconditionally: this is needed since the port to meson. +- Pass enable-man=true option to meson: man files are no longer + built unless this is explicitly specified. +- Drop the find command for finding and deleting libtool archives: + these are no longer built since the port to meson build system. + ------------------------------------------------------------------- Tue Oct 3 20:33:13 UTC 2017 - luc14n0@linuxmail.org diff --git a/dconf.spec b/dconf.spec index 700968a..01fb441 100644 --- a/dconf.spec +++ b/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