From 2cde9b5ff6962124dabb7f7f4343581ab8c19f14 Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Wed, 5 Aug 2020 11:03:48 +0200 Subject: [PATCH] Update to 1.45.3 --- 0001-afc-Add-support-for-libplist-2.2.patch | 30 --------------------- gvfs.spec | 10 +++---- sources | 2 +- 3 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 0001-afc-Add-support-for-libplist-2.2.patch diff --git a/0001-afc-Add-support-for-libplist-2.2.patch b/0001-afc-Add-support-for-libplist-2.2.patch deleted file mode 100644 index ef11d57..0000000 --- a/0001-afc-Add-support-for-libplist-2.2.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 13551f3f40d41f1357126ac5a26d0fa012cd8123 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Tue, 16 Jun 2020 13:28:35 +0200 -Subject: [PATCH] afc: Add support for libplist-2.2 - -Which changed name from libplist to libplist-2.0 to embed its API -version number in the library name. ---- - meson.build | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 1750f65c..187bfd55 100644 ---- a/meson.build -+++ b/meson.build -@@ -357,7 +357,10 @@ config_h.set('HAVE_LOGIND', enable_logind) - enable_afc = get_option('afc') - if enable_afc - libimobiledevice_dep = dependency('libimobiledevice-1.0', version: '>= 1.2') -- libplist_dep = dependency('libplist', version: '>= 0.15') -+ libplist_dep = dependency('libplist-2.0', required: false) -+ if not libplist_dep.found() -+ libplist_dep = dependency('libplist', version: '>= 0.15') -+ endif - endif - - # *** Check if we should build with GOA volume monitor *** --- -2.26.2 - diff --git a/gvfs.spec b/gvfs.spec index eb649fb..c12c5b3 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -22,17 +22,14 @@ %global udisks2_version 1.97 Name: gvfs -Version: 1.45.2 -Release: 4%{?dist} +Version: 1.45.3 +Release: 1%{?dist} Summary: Backends for the gio framework in GLib License: GPLv3 and LGPLv2+ and BSD and MPLv2.0 URL: https://wiki.gnome.org/Projects/gvfs Source0: https://download.gnome.org/sources/gvfs/1.45/gvfs-%{version}.tar.xz -# https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/88 -Patch0: 0001-afc-Add-support-for-libplist-2.2.patch - BuildRequires: meson BuildRequires: gcc BuildRequires: git @@ -413,6 +410,9 @@ killall -USR1 gvfsd >&/dev/null || : %{_datadir}/installed-tests %changelog +* Tue Aug 04 2020 Ondrej Holy - 1.45.3-1 +- Update to 1.45.3 + * Tue Jul 28 2020 Fedora Release Engineering - 1.45.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 4f67b75..1e2ada8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gvfs-1.45.2.tar.xz) = f57770a523803474c59fc850fabf59ddc5bf9dcb088ad06af092280135bd882197f63cf5581219b8fed880b5a9efd8d66b4e230133927480c35ab0b4411b0759 +SHA512 (gvfs-1.45.3.tar.xz) = 1056543c6d552d96ab83d928e40f8dc3b0f81e096fd5dbcd6a07e5124728e79bb302cd65504d846d00be210786b993b19315b9de0cd7c5f2f07466d87fb3cee6