diff --git a/gvfs-1.40.2.tar.xz b/gvfs-1.40.2.tar.xz deleted file mode 100644 index 105a5c2..0000000 Binary files a/gvfs-1.40.2.tar.xz and /dev/null differ diff --git a/gvfs-1.46.2.tar.xz b/gvfs-1.46.2.tar.xz new file mode 100644 index 0000000..4ce97ef Binary files /dev/null and b/gvfs-1.46.2.tar.xz differ diff --git a/gvfs.spec b/gvfs.spec index 03302da..c35211e 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -1,41 +1,38 @@ -#spec file for gvfs -%define _unpackaged_files_terminate_build 0 %global avahi_version 0.6 -%global fuse_version 2.8.0 +%global fuse_version 3.0.0 %global gettext_version 0.19.4 %global glib2_version 2.57.2 +%global gsettings_desktop_schemas_version 3.33.0 %global goa_version 3.17.1 %global gudev_version 147 %global libarchive_version 3.0.22 %global libcdio_paranoia_version 0.78.2 %global libgcrypt_version 1.2.2 -%global libgdata_version 0.17.9 +%global libgdata_version 0.17.11 %global libgphoto2_version 2.5.0 %global libimobiledevice_version 1.2 -%global libmtp_version 1.1.12 +%global libmtp_version 1.1.14 %global libnfs_version 1.9.8 -%global libplist_version 0.15 -%global libsmbclient_version 3.4.0 -%global libsoup_version 2.42.0 +%global libplist_version 2.2 +%global libsmbclient_version 4.12.0 +%global libsoup_version 2.58.0 %global libusb_version 1.0.21 %global systemd_version 206 %global talloc_version 1.3.0 %global udisks2_version 1.97 Name: gvfs -Version: 1.40.2 -Release: 8 +Version: 1.46.2 +Release: 1 Summary: gvfs is a 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.40/gvfs-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gvfs/1.46/gvfs-%{version}.tar.xz -Patch0001: resolve-the-compilation-failure-caused-by-the-libplist-upgrade.patch - -BuildRequires: /usr/bin/ssh +BuildRequires: /usr/bin/ssh git pkgconfig fuse3 BuildRequires: meson gcc pkgconfig pkgconfig(glib-2.0) >= %{glib2_version} pkgconfig(dbus-glib-1) pkgconfig(gcr-3) -BuildRequires: openssl-devel gdb +BuildRequires: openssl-devel gdb pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version} BuildRequires: pkgconfig(libcdio_paranoia) >= %{libcdio_paranoia_version} pkgconfig(gudev-1.0) >= %{gudev_version} BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version} pkgconfig(avahi-client) >= %{avahi_version} BuildRequires: pkgconfig(avahi-glib) >= %{avahi_version} pkgconfig(libsecret-1) @@ -48,22 +45,23 @@ BuildRequires: pkgconfig(talloc) >= %{talloc_version} BuildRequires: pkgconfig(libarchive) >= %{libarchive_version} BuildRequires: pkgconfig(libgphoto2) >= %{libgphoto2_version} BuildRequires: libusb-devel >= %{libusb_version} libexif-devel -BuildRequires: pkgconfig(fuse) >= %{fuse_version} +BuildRequires: pkgconfig(fuse3) >= %{fuse_version} BuildRequires: pkgconfig(libimobiledevice-1.0) >= %{libimobiledevice_version} BuildRequires: pkgconfig(libplist-2.0) >= %{libplist_version} BuildRequires: libgcrypt-devel >= %{libgcrypt_version} BuildRequires: pkgconfig(libmtp) >= %{libmtp_version} BuildRequires: pkgconfig(libnfs) >= %{libnfs_version} gdb +BuildRequires: pkgconfig(libbluray) Requires: glib2%{?_isa} >= %{glib2_version} udisks2 >= %{udisks2_version} -Requires: fuse >= %{fuse_version} -Requires: libgdata%{?_isa} >= %{libgdata_version} +Requires: fuse3 >= %{fuse_version} gsettings-desktop-schemas >= %{gsettings_desktop_schemas_version} +Requires: libgdata%{?_isa} >= %{libgdata_version} usbmuxd Requires: %{name}-client%{?_isa} = %{version}-%{release} Requires(post): desktop-file-utils >= 0.22-6 Requires(postun): desktop-file-utils >= 0.22-6 -Provides: %{name}-fuse %{name}-fuse%{?_isa} %{name}-smb %{name}-archive %{name}-gphoto2 %{name}-afc %{name}-afp %{name}-mtp %{name}-goa %{name}-tests -Obsoletes: %{name}-fuse %{name}-smb %{name}-archive %{name}-gphoto2 %{name}-afc %{name}-afp %{name}-mtp %{name}-goa %{name}-tests +Provides: %{name}-fuse3 %{name}-smb %{name}-archive %{name}-gphoto2 %{name}-afc %{name}-afp %{name}-mtp %{name}-goa %{name}-tests +Obsoletes: %{name}-fuse3 %{name}-smb %{name}-archive %{name}-gphoto2 %{name}-afc %{name}-afp %{name}-mtp %{name}-goa %{name}-tests Obsoletes: gnome-mount <= 0.8 gnome-mount-nautilus-properties <= 0.8 Obsoletes: gvfs-obexftp < 1.17.91-2 Obsoletes: %{name} < 1.9.4-1 @@ -102,7 +100,7 @@ This package contains help documentation for gvfs %autosetup -n %{name}-%{version} -p1 %build -%meson -Dinstalled_tests=true -Dman=true -Dnfs=false -Dbluray=false %{nil} +%meson -Dinstalled_tests=true -Dman=true -Dnfs=false -Dbluray=false -Dafc=false %{nil} %meson_build %install @@ -152,6 +150,12 @@ killall -USR1 gvfsd >&/dev/null || : %{_datadir}/glib-2.0/schemas/*.xml %{_datadir}/polkit-1/actions/org.gtk.vfs.file-operations.policy %{_datadir}/polkit-1/rules.d/org.gtk.vfs.file-operations.rules +%{_datadir}/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service +%{_datadir}/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service +%{_datadir}/gvfs/mounts/gphoto2.mount +%{_datadir}/gvfs/mounts/mtp.mount +%{_datadir}/gvfs/remote-volume-monitors/gphoto2.monitor +%{_datadir}/gvfs/remote-volume-monitors/mtp.monitor %{_libdir}/gvfs/libgvfsdaemon.so %{_libexecdir}/gvfs-goa-volume-monitor %{_libexecdir}/gvfs-udisks2-volume-monitor @@ -177,10 +181,16 @@ killall -USR1 gvfsd >&/dev/null || : %{_libexecdir}/gvfsd-smb %{_libexecdir}/gvfsd-smb-browse %{_libexecdir}/gvfsd-trash +%{_libexecdir}/gvfs-gphoto2-volume-monitor +%{_libexecdir}/gvfs-mtp-volume-monitor +%{_libexecdir}/gvfsd-gphoto2 +%{_libexecdir}/gvfsd-mtp %{_userunitdir}/gvfs-daemon.service %{_userunitdir}/gvfs-metadata.service %{_userunitdir}/gvfs-udisks2-volume-monitor.service %{_userunitdir}/gvfs-goa-volume-monitor.service +%{_userunitdir}/gvfs-gphoto2-volume-monitor.service +%{_userunitdir}/gvfs-mtp-volume-monitor.service %{_tmpfilesdir}/gvfsd-fuse-tmpfiles.conf %files client -f gvfs.lang @@ -207,6 +217,12 @@ killall -USR1 gvfsd >&/dev/null || : %{_mandir}/man1/gvfsd-fuse.1* %changelog +* Mon May 31 2021 weijin deng - 1.46.2-1 +- Upgrade to 1.46.2 +- Update Version, Release, Source0, BuildRequires, Requires, Obsoletes +- Delete patch that existed in new version. +- Update stage 'build', 'files', global variable quantity + * Tue Oct 13 2020 zhanzhimin - 1.40.2-8 - add gvfs-fuse(x86-64) dependency @@ -231,11 +247,11 @@ killall -USR1 gvfsd >&/dev/null || : * Tue Jan 7 2020 openEuler Buildteam - 1.40.2-1 - update to 1.40.2 -* Tue Sep 26 2019 openEuler Buildteam - 1.38.1-3 +* Thu Sep 26 2019 openEuler Buildteam - 1.38.1-3 - Type:cves - ID:CVE-2019-12447 CVE-2019-12448 CVE-2019-12449 - SUG:restart - DESC:fix CVE-2019-12447 CVE-2019-12448 CVE-2019-12449 -* Tue Sep 26 2019 openEuler Buildteam - 1.38.1-2 +* Thu Sep 26 2019 openEuler Buildteam - 1.38.1-2 - Package init diff --git a/resolve-the-compilation-failure-caused-by-the-libplist-upgrade.patch b/resolve-the-compilation-failure-caused-by-the-libplist-upgrade.patch deleted file mode 100644 index c4751cb..0000000 --- a/resolve-the-compilation-failure-caused-by-the-libplist-upgrade.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar gvfs-1.40.2.origin/meson.build gvfs-1.40.2/meson.build ---- gvfs-1.40.2.origin/meson.build 2020-08-12 10:56:28.913116340 +0800 -+++ gvfs-1.40.2/meson.build 2020-08-12 11:02:03.356989688 +0800 -@@ -355,7 +355,7 @@ - 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', version: '>= 0.15') - endif - - # *** Check if we should build with GOA volume monitor ***