diff --git a/.gitignore b/.gitignore index 01dfb0d..b030d48 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gsettings-desktop-schemas-3.14.2.tar.xz +SOURCES/gsettings-desktop-schemas-3.22.0.tar.xz diff --git a/.gsettings-desktop-schemas.metadata b/.gsettings-desktop-schemas.metadata index 56f9438..c1978ca 100644 --- a/.gsettings-desktop-schemas.metadata +++ b/.gsettings-desktop-schemas.metadata @@ -1 +1 @@ -32499be2a1a9ef79c65e8527f70fbdfd3a5c034f SOURCES/gsettings-desktop-schemas-3.14.2.tar.xz +924bd3fe84eaf6658e6b37d52554e55e2a1c86d1 SOURCES/gsettings-desktop-schemas-3.22.0.tar.xz diff --git a/SPECS/gsettings-desktop-schemas.spec b/SPECS/gsettings-desktop-schemas.spec index 0f9ee1d..2e29eae 100644 --- a/SPECS/gsettings-desktop-schemas.spec +++ b/SPECS/gsettings-desktop-schemas.spec @@ -1,21 +1,25 @@ %global debug_package %{nil} Name: gsettings-desktop-schemas -Version: 3.14.2 +Version: 3.22.0 Release: 1%{?dist} Summary: A collection of GSettings schemas -Group: System Environment/Libraries License: LGPLv2+ # no homepage exists for this component URL: http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas #VCS: git:git://git.gnome.org/gsettings-desktop-schemas -Source: http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz BuildRequires: glib2-devel >= 2.31.0 BuildRequires: intltool BuildRequires: gobject-introspection-devel +# Older versions need the "scroll-method" key that was removed in 3.19.3 +Conflicts: control-center < 1:3.19.3 +Conflicts: gnome-settings-daemon < 3.19.3 +Conflicts: mutter < 3.19.3 + Requires: glib2 >= 2.31.0 %description @@ -24,7 +28,6 @@ settings shared by various components of a desktop. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -35,13 +38,14 @@ and header files for developing applications that use %{name}. %prep %setup -q + %build %configure --disable-schemas-compile --enable-introspection=yes make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install %find_lang %{name} --with-gnome @@ -55,7 +59,8 @@ fi %files -f %{name}.lang -%doc AUTHORS COPYING MAINTAINERS NEWS README +%doc AUTHORS MAINTAINERS NEWS README +%license COPYING %{_datadir}/glib-2.0/schemas/* %{_datadir}/GConf/gsettings/gsettings-desktop-schemas.convert %{_datadir}/GConf/gsettings/wm-schemas.convert @@ -69,6 +74,10 @@ fi %changelog +* Wed Sep 21 2016 Kalev Lember - 3.22.0-1 +- Update to 3.22.0 +- Resolves: #1386977 + * Thu Apr 30 2015 Bastien Nocera 3.14.2-1 - Update to 3.14.2 Resolves: #1174444