Accepting request 695649 from GNOME:Next

Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/695649
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=270

gnome-desktop-3.30.2.1.tar.xz

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

gnome-desktop-3.32.1.tar.xz

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

gnome-desktop.changes

@@ -1,3 +1,60 @@
+-------------------------------------------------------------------
+Wed Apr 10 09:56:03 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 3.32.1:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Mar 12 06:38:14 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 3.32.0:
+  + Stable release version bump.
+
+-------------------------------------------------------------------
+Fri Mar  8 08:03:28 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 3.31.92:
+  + tests: fixes to use uselocale.
+  + Thumbnail: Only mount fontconfig cache if it exists.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Thu Feb 21 12:34:55 UTC 2019 - bjorn.lie@gmail.com
+
+- Update to version 3.31.91:
+  + Updated translations.
+- Changes from version 3.31.90:
+  + Fix slow thumbnailer due to missing font cache.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Thu Feb  7 03:31:05 UTC 2019 - bjorn.lie@gmail.com
+
+- Fix translation-update-upstream call, needed after update of
+  translation-update-upstream in distro.
+
+-------------------------------------------------------------------
+Thu Feb  7 03:31:04 UTC 2019 - bjorn.lie@gmail.com
+
+- Update to version 3.31.4:
+  + Fix some thumbnailer sandboxing issues.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Thu Feb  7 03:31:03 UTC 2019 - bjorn.lie@gmail.com
+
+- Update to version 3.31.3:
+  + Use LC_TIME for time format string translations.
+  + Fix a use-after-free in the thumbnailer.
+- Changes from version 3.31.2:
+  + Updated translations.
+- Changes from version 3.31.1:
+  + Port buildsystem to meson.
+  + Updated translations.
+- Switch to meson buildsystem, add meson BuildRequires and macros.
+- Drop all conditionals and gnome-common BuildRequires: they are
+  not needed, nor make sense after the port to meson.
+
 -------------------------------------------------------------------
 Wed Feb  6 08:21:52 UTC 2019 - bjorn.lie@gmail.com
 

gnome-desktop.spec

@@ -16,30 +16,31 @@
 #
 
 
-%define IS_DEFAULT_GNOME_DESKTOP 1
 Name:           gnome-desktop
-Version:        3.30.2.1
+Version:        3.32.1
 Release:        0
 Summary:        The GNOME Desktop API Library
 License:        LGPL-2.1-or-later
 Group:          System/GUI/GNOME
 URL:            https://www.gnome.org
-Source0:        https://download.gnome.org/sources/gnome-desktop/3.30/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gnome-desktop/3.32/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
 
-# PATFH-FIX-OPENSUSE gnome-desktop-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- Switch new user's default input engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus input frame-work condition.
+# PATCH-FIX-OPENSUSE gnome-desktop-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- Switch new user's default input engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus input frame-work condition.
 Patch1:         gnome-desktop-switch-Japanese-default-input-to-mozc.patch
 
 BuildRequires:  fdupes
 BuildRequires:  gobject-introspection-devel
+BuildRequires:  gtk-doc
 BuildRequires:  intltool
+BuildRequires:  meson
 BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
 BuildRequires:  yelp-tools
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0) >= 2.36.5
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.53.0
-BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.27.0
+BuildRequires:  pkgconfig(gsettings-desktop-schemas) >= 3.31.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.3.6
 BuildRequires:  pkgconfig(iso-codes)
 BuildRequires:  pkgconfig(libseccomp)
@@ -47,22 +48,16 @@ BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xkbfile)
 BuildRequires:  pkgconfig(xkeyboard-config)
-%if 0%{?BUILD_FROM_VCS}
-BuildRequires:  gnome-common
-BuildRequires:  gtk-doc
-%endif
 
 %description
 This package contains the desktop-wide files.
 
-%if %{IS_DEFAULT_GNOME_DESKTOP} || 0%{?BUILD_FROM_VCS}
 %package -n gnome-version
 Summary:        GNOME version
 Group:          System/GUI/GNOME
 
 %description -n gnome-version
 This package contains information on the version of GNOME that is installed.
-%endif
 
 %package -n libgnome-desktop-3_0-common
 Summary:        Common data files for the GNOME Desktop API library
@@ -85,9 +80,7 @@ Requires:       gsettings-desktop-schemas
 Requires:       libgnome-desktop-3_0-common >= %{version}
 Recommends:     %{name}-lang
 Provides:       %{name} = %{version}
-%if %{IS_DEFAULT_GNOME_DESKTOP}
 Obsoletes:      %{name} < %{version}
-%endif
 
 %description -n libgnome-desktop-3-17
 The libgnome-desktop library provides API shared by several applications
@@ -113,12 +106,10 @@ Requires:       libgnome-desktop-3-17 = %{version}
 # Needed as /usr/include/gnome-desktop-3.0/libgnome-desktop/gnome-xkb-info.h includes X11/extensions/XKBrules.h
 Requires:       libxkbfile-devel
 Requires:       typelib-1_0-GnomeDesktop-3_0 = %{version}
-%if %{IS_DEFAULT_GNOME_DESKTOP}
 Provides:       %{name}-devel = %{version}
 Obsoletes:      %{name}-devel < %{version}
 Provides:       %{name}-doc = %{version}
 Obsoletes:      %{name}-doc < %{version}
-%endif
 
 %description -n libgnome-desktop-3-devel
 The libgnome-desktop library provides API shared by several applications
@@ -128,37 +119,26 @@ reasons.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
-%patch1 -p1
+translation-update-upstream po gnome-desktop
-translation-update-upstream
-
-%if 0%{?BUILD_FROM_VCS}
-[ -x ./autogen.sh] && NOCONFIGURE=1 ./autogen.sh
-%endif
 
 %build
-%configure \
+%meson \
-        --disable-static \
+	-Dgnome_distributor=openSUSE \
-%if 0%{?BUILD_FROM_VCS}
+	-Ddate_in_gnome_version=false \
-        --enable-gtk-doc \
+	-Ddesktop_docs=true \
-%endif
+	-Dgtk_doc=true \
-        --with-gnome-distributor="SUSE" \
+	%{nil}
-        --disable-date-in-gnome-version \
+%meson_build
-        %{nil}
-%make_build
 
 %install
-%make_install
+%meson_install
 
 %find_lang %{name}-3.0 %{?no_lang_C}
 %find_lang fdl %{?no_lang_C} %{name}-3.0.lang
 %find_lang gpl %{?no_lang_C} %{name}-3.0.lang
 %find_lang lgpl %{?no_lang_C} %{name}-3.0.lang
 
-%if ! (%{IS_DEFAULT_GNOME_DESKTOP} || 0%{?BUILD_FROM_VCS})
-rm %{buildroot}%{_datadir}/gnome/gnome-version.xml
-%endif
-find %{buildroot} -type f -name "*.la" -delete -print
 %fdupes %{buildroot}/%{_prefix}
 
 %post -n libgnome-desktop-3-17 -p /sbin/ldconfig
@@ -187,10 +167,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %files lang -f %{name}-3.0.lang
 
-%if %{IS_DEFAULT_GNOME_DESKTOP} || 0%{?BUILD_FROM_VCS}
 %files -n gnome-version
 %dir %{_datadir}/gnome
 %{_datadir}/gnome/gnome-version.xml
-%endif
 
 %changelog