rpms/gvfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

+ gvfs-1.45.2-2

Browse Source 
Rebuild with libplist 2.2 support
This commit is contained in:
Bastien Nocera 2020-06-17 11:44:06 +02:00
parent 31b9230020
commit 02a663edc2
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-afc-Add-support-for-libplist-2.2.patch Normal file
View File

@ -0,0 +1,30 @@
From 13551f3f40d41f1357126ac5a26d0fa012cd8123 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
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

12
gvfs.spec
View File

@ -23,15 +23,19 @@
Name: gvfs
Version: 1.45.2
Release: 1%{?dist}
Release: 2%{?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
BuildRequires: pkgconfig
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(dbus-glib-1)
@ -214,7 +218,7 @@ The gvfs-tests package contains tests that can be used to verify
the functionality of the installed gvfs package.
%prep
%autosetup -p1
%autosetup -p1 -S git
%build
%meson -Dinstalled_tests=true \
@ -402,6 +406,10 @@ killall -USR1 gvfsd >&/dev/null || :
%{_datadir}/installed-tests
%changelog
* Wed Jun 17 2020 Bastien Nocera <bnocera@redhat.com> - 1.45.2-2
+ gvfs-1.45.2-2
- Rebuild with libplist 2.2 support
* Fri May 29 2020 Kalev Lember <klember@redhat.com> - 1.45.2-1
- Update to 1.45.2