diff --git a/.gitignore b/.gitignore index b90888f..d3d2329 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ gsettings-desktop-schemas-0.0.1.git20100729.tar.bz2 /gsettings-desktop-schemas-3.28.0.tar.xz /gsettings-desktop-schemas-3.28.1.tar.xz /gsettings-desktop-schemas-3.31.0.1.tar.xz +/gsettings-desktop-schemas-3.31.0.2.tar.xz diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index 7c6ff4c..2133ab2 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -1,8 +1,8 @@ %global debug_package %{nil} Name: gsettings-desktop-schemas -Version: 3.31.0.1 -Release: 2%{?dist} +Version: 3.31.0.2 +Release: 1%{?dist} Summary: A collection of GSettings schemas License: LGPLv2+ @@ -10,11 +10,10 @@ License: LGPLv2+ URL: http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas Source0: http://download.gnome.org/sources/%{name}/3.31/%{name}-%{version}.tar.xz -BuildRequires: automake autoconf -BuildRequires: gnome-common +BuildRequires: gettext BuildRequires: glib2-devel >= 2.31.0 BuildRequires: gobject-introspection-devel -BuildRequires: intltool +BuildRequires: meson # Older versions need the "scroll-method" key that was removed in 3.19.3 Conflicts: control-center < 1:3.19.3 @@ -42,13 +41,12 @@ and header files for developing applications that use %{name}. %build -./autogen.sh -%configure --disable-schemas-compile --enable-introspection=yes -%make_build +%meson +%meson_build %install -%make_install +%meson_install %find_lang %{name} --with-gnome @@ -74,6 +72,10 @@ glib-compile-schemas --dry-run --strict $RPM_BUILD_ROOT%{_datadir}/glib-2.0/sche %changelog +* Tue Jan 15 2019 Kalev Lember - 3.31.0.2-1 +- Update to 3.31.0.2 +- Switch to meson once again now that enums generation is fixed + * Thu Jan 10 2019 Kalev Lember - 3.31.0.1-2 - Switch back to autotools to fix missing org.gnome.desktop.enums.xml - Add a test to verify that the schemas compile diff --git a/sources b/sources index 9700a6b..08b1012 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gsettings-desktop-schemas-3.31.0.1.tar.xz) = 11598dc86f680dad475f49279691d7d23f0e3b2646f38a444270d98c45b480cc3b26ec70796a14af07bf987c1b4f26b723cde12518a402e84cae24ac73545e05 +SHA512 (gsettings-desktop-schemas-3.31.0.2.tar.xz) = 353018becaae96d6a3779588a11b98b86deeeca77bf16457ec8df8302788ec1b51d762bb97cd0e57408e7512accf2dfc8b9dcdfe515931c9dc0feda5217c243b