From 2424e92b9daf16d8a4c40b67d347c5eb9d6045d4196295a0b1998656f983e87a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 21 Mar 2022 08:36:50 +0000 Subject: [PATCH] Accepting request 963225 from GNOME:Next - Update to version 1.50.0: + Updated translations. - Update to version 1.49.90: + http/dav: Port to libsoup3. + http: Do not silently accept invalid certificates. + build: Remove incorrect i18n.merge_file argument to fix build. + Updated translations. - Drop 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch: Fixed upstream. - Replace pkgconfig(libsoup-2.4) with pkgconfig(libsoup-3.0) BuildRequires following upstreams port. - Rebase 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch: Use upstream commit. - Update to version 1.49.1: + sftp: Adapt on new OpenSSH password prompts + build: Set of improvements for meson + Add PartOf=graphical-session.target to all systemd units + Move systemd services to session slice + Updated translations. - Pass systemduserunitdir=%%{_userunitdir} to meson, ensure we set the correct dir for systemduserunitdir. OBS-URL: https://build.opensuse.org/request/show/963225 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=363 --- ...67b9b823a0d54e061eae45ff8e2c7e4a88d0.patch | 11 ------ gvfs-1.48.1.tar.xz | 3 -- gvfs-1.50.0.tar.xz | 3 ++ gvfs.changes | 37 +++++++++++++++++++ gvfs.spec | 18 ++++----- 5 files changed, 48 insertions(+), 24 deletions(-) delete mode 100644 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch delete mode 100644 gvfs-1.48.1.tar.xz create mode 100644 gvfs-1.50.0.tar.xz diff --git a/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch b/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch deleted file mode 100644 index 816184c..0000000 --- a/17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur orig-gvfs-1.48.1/daemon/meson.build gvfs-1.48.1/daemon/meson.build ---- orig-gvfs-1.48.1/daemon/meson.build 2022-02-08 18:43:00.707587580 +0100 -+++ gvfs-1.48.1/daemon/meson.build 2022-02-08 18:44:15.400411932 +0100 -@@ -366,7 +366,6 @@ - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: '@BASENAME@', - po_dir: po_dir, diff --git a/gvfs-1.48.1.tar.xz b/gvfs-1.48.1.tar.xz deleted file mode 100644 index f527e72..0000000 --- a/gvfs-1.48.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2 -size 1225916 diff --git a/gvfs-1.50.0.tar.xz b/gvfs-1.50.0.tar.xz new file mode 100644 index 0000000..e303fcf --- /dev/null +++ b/gvfs-1.50.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbc2f564d2e9f00c760673f42d6803bce3e081ab7ffb4456deffffba9339b4dd +size 1213456 diff --git a/gvfs.changes b/gvfs.changes index 2ebe86e..a064ed6 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri Mar 18 12:27:54 UTC 2022 - Bjørn Lie + +- Update to version 1.50.0: + + Updated translations. + +------------------------------------------------------------------- +Fri Feb 11 09:25:12 UTC 2022 - Bjørn Lie + +- Update to version 1.49.90: + + http/dav: Port to libsoup3. + + http: Do not silently accept invalid certificates. + + build: Remove incorrect i18n.merge_file argument to fix build. + + Updated translations. +- Drop 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch: Fixed + upstream. +- Replace pkgconfig(libsoup-2.4) with pkgconfig(libsoup-3.0) + BuildRequires following upstreams port. + +------------------------------------------------------------------- +Tue Feb 8 17:41:08 UTC 2022 - Bjørn Lie + +- Rebase 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch: Use + upstream commit. + ------------------------------------------------------------------- Tue Feb 8 17:40:08 UTC 2022 - Bjørn Lie @@ -11,6 +36,18 @@ Sat Jan 15 20:57:06 UTC 2022 - Bjørn Lie - Package org.gtk.vfs.file-operations.rules polkit rules file as an example in docs, previously it was just nuked. +------------------------------------------------------------------- +Fri Jan 7 18:12:26 UTC 2022 - Bjørn Lie + +- Update to version 1.49.1: + + sftp: Adapt on new OpenSSH password prompts + + build: Set of improvements for meson + + Add PartOf=graphical-session.target to all systemd units + + Move systemd services to session slice + + Updated translations. +- Pass systemduserunitdir=%%{_userunitdir} to meson, ensure we + set the correct dir for systemduserunitdir. + ------------------------------------------------------------------- Thu Sep 16 01:56:26 UTC 2021 - Stanislav Brabec diff --git a/gvfs.spec b/gvfs.spec index 3ef8634..3cb4330 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -18,18 +18,15 @@ %bcond_without cdda Name: gvfs -Version: 1.48.1 +Version: 1.50.0 Release: 0 Summary: Virtual File System functionality for GLib License: GPL-3.0-only AND LGPL-2.0-or-later Group: Development/Libraries/C and C++ URL: https://wiki.gnome.org/Projects/gvfs -Source0: https://download.gnome.org/sources/gvfs/1.48/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gvfs/1.50/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch -- Fix build with meson 0.61 and newer -Patch0: 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0.patch - ### NOTE: Please, keep SLE-only patches at bottom (starting on 1000). # PATCH-FEATURE-SLE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus Patch1000: gvfs-nds.patch @@ -49,7 +46,7 @@ BuildRequires: pkgconfig(fuse3) >= 3.0.0 BuildRequires: pkgconfig(gcr-base-3) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(glib-2.0) >= 2.65.1 +BuildRequires: pkgconfig(glib-2.0) >= 2.70.0 BuildRequires: pkgconfig(goa-1.0) >= 3.17.1 BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.33.0 @@ -63,7 +60,7 @@ BuildRequires: pkgconfig(libimobiledevice-1.0) >= 1.2 BuildRequires: pkgconfig(libmtp) >= 1.1.12 BuildRequires: pkgconfig(libnfs) >= 1.9.8 BuildRequires: pkgconfig(libsecret-unstable) -BuildRequires: pkgconfig(libsoup-2.4) >= 2.42.0 +BuildRequires: pkgconfig(libsoup-3.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libusb-1.0) >= 1.0.21 BuildRequires: pkgconfig(polkit-gobject-1) >= 0.114 @@ -161,7 +158,7 @@ gvfs plugins. %prep %setup -q -%patch0 -p1 + %if 0%{?sle_version} %patch1000 -p1 %patch1001 -p1 @@ -173,13 +170,14 @@ gvfs plugins. -Dudisks2=true \ %{!?with_cdda: -Dcdda=false} \ -Dman=true \ + -Dsystemduserunitdir=%{_userunitdir} \ %{nil} %meson_build %install %meson_install # drop polkit rules files (for wheel group) - boo#1125433 -rm %{buildroot}%{_datadir}/polkit-1/rules.d/org.gtk.vfs.file-operations.rules +rm -v %{buildroot}%{_datadir}/polkit-1/rules.d/org.gtk.vfs.file-operations.rules find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} @@ -204,7 +202,7 @@ mv daemon/trashlib/COPYING daemon/trashlib/COPYING.trashlib %files %license COPYING daemon/trashlib/COPYING.trashlib %doc NEWS README.md -%doc daemon/org.gtk.vfs.file-operations.rules +%doc daemon/org.gtk.vfs.file-operations.rules.in %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/mounts %dir %{_datadir}/%{name}/remote-volume-monitors