From c63cc9c3c933db93bdb9c9ef6d6ee7e0e405b20f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 5 Nov 2019 15:19:47 -0500 Subject: [PATCH] import gnome-desktop3-3.32.2-1.el8 --- .gitignore | 2 +- .gnome-desktop3.metadata | 2 +- SPECS/gnome-desktop3.spec | 23 ++++++++++++++--------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index d01560a..349c282 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-desktop-3.28.2.tar.xz +SOURCES/gnome-desktop-3.32.2.tar.xz diff --git a/.gnome-desktop3.metadata b/.gnome-desktop3.metadata index 598c848..c1bede5 100644 --- a/.gnome-desktop3.metadata +++ b/.gnome-desktop3.metadata @@ -1 +1 @@ -3ea90d5fd86e51a02fd55b966bc6f20eee5c6799 SOURCES/gnome-desktop-3.28.2.tar.xz +8faf1084c976cccc2e973a48ef0fa314d6606323 SOURCES/gnome-desktop-3.32.2.tar.xz diff --git a/SPECS/gnome-desktop3.spec b/SPECS/gnome-desktop3.spec index 588a4ab..4c8e5b6 100644 --- a/SPECS/gnome-desktop3.spec +++ b/SPECS/gnome-desktop3.spec @@ -6,13 +6,13 @@ %global po_package gnome-desktop-3.0 Name: gnome-desktop3 -Version: 3.28.2 +Version: 3.32.2 Release: 1%{?dist} Summary: Shared code among gnome-panel, gnome-session, nautilus, etc License: GPLv2+ and LGPLv2+ URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/gnome-desktop/3.28/gnome-desktop-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-desktop/3.32/gnome-desktop-%{version}.tar.xz BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= %{gdk_pixbuf2_version} BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} @@ -24,10 +24,11 @@ BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(xkeyboard-config) +BuildRequires: gcc BuildRequires: gettext BuildRequires: gtk-doc >= %{gtk_doc_version} -BuildRequires: intltool BuildRequires: itstool +BuildRequires: meson Requires: bubblewrap Requires: gdk-pixbuf2%{?_isa} >= %{gdk_pixbuf2_version} @@ -73,14 +74,11 @@ the functionality of the installed %{name} package. %autosetup -p1 -n gnome-desktop-%{version} %build -%configure --enable-installed-tests -make %{?_smp_mflags} +%meson -Dgtk_doc=true -Dinstalled_tests=true +%meson_build %install -%make_install - -# stuff we don't want -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +%meson_install %find_lang %{po_package} --all-name --with-gnome @@ -107,6 +105,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_datadir}/installed-tests %changelog +* Fri Jun 14 2019 Florian Müllner - 3.32.2-1 +- Rebase to 3.32.2 + Resolves: #1719241 + +* Wed Dec 12 2018 Ray Strode - 3.28.2-2 +- rebuild + * Thu May 10 2018 Kalev Lember - 3.28.2-1 - Update to 3.28.2