Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/nautilus.git#aa35ba234ee79a2fe8c22fa3a365a298ccae2fd9

.gitignore

@@ -146,3 +146,4 @@ nautilus-2.31.6.tar.bz2
 /nautilus-3.38.0.tar.xz
 /nautilus-3.38.1.tar.xz
 /nautilus-3.38.2.tar.xz
+/nautilus-40.beta.tar.xz

nautilus.spec

@@ -1,14 +1,17 @@
-%global glib2_version 2.62.0
+%global glib2_version 2.67.1
+%global gnome_autoar_version 0.3.0
 %global gtk3_version 3.22.27
 
+%global tarball_version %%(echo %{version} | tr '~' '.')
+
 Name:           nautilus
-Version:        3.38.2
+Version:        40~beta
 Release:        2%{?dist}
 Summary:        File manager for GNOME
 
 License:        GPLv3+
 URL:            https://wiki.gnome.org/Apps/Nautilus
-Source0:        https://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc
@@ -17,13 +20,17 @@ BuildRequires:  gtk-doc
 BuildRequires:  meson
 BuildRequires:  pkgconfig(gexiv2)
 BuildRequires:  pkgconfig(glib-2.0) >= %{glib2_version}
-BuildRequires:  pkgconfig(gnome-autoar-0)
+BuildRequires:  pkgconfig(gnome-autoar-0) >= %{gnome_autoar_version}
 BuildRequires:  pkgconfig(gnome-desktop-3.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gsettings-desktop-schemas)
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0)
 BuildRequires:  pkgconfig(gstreamer-tag-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= %{gtk3_version}
+BuildRequires:  pkgconfig(libhandy-1)
+%if 0%{?flatpak}
+BuildRequires:  pkgconfig(libportal)
+%endif
 BuildRequires:  pkgconfig(libseccomp)
 BuildRequires:  pkgconfig(libselinux)
 BuildRequires:  pkgconfig(libxml-2.0)
@@ -32,6 +39,7 @@ BuildRequires:  pkgconfig(x11)
 BuildRequires:  /usr/bin/appstream-util
 
 Requires:       glib2%{_isa} >= %{glib2_version}
+Requires:       gnome-autoar%{_isa} >= %{gnome_autoar_version}
 Requires:       gsettings-desktop-schemas%{_isa}
 Requires:       gtk3%{_isa} >= %{gtk3_version}
 Requires:       gvfs%{_isa}
@@ -70,7 +78,7 @@ This package provides libraries and header files needed
 for developing nautilus extensions.
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{name}-%{tarball_version}
 
 # Remove -Werror from compiler flags
 sed -i '/-Werror/d' meson.build
@@ -81,6 +89,9 @@ sed -i '/-Werror/d' meson.build
   -Dextensions=true \
   -Dintrospection=true \
   -Dselinux=true \
+%if ! 0%{?flatpak}
+  -Dlibportal=false \
+%endif
   %{nil}
 %meson_build
 
@@ -134,6 +145,12 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 %doc %{_datadir}/gtk-doc/html/libnautilus-extension/
 
 %changelog
+* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 40~beta-2
+- Only require libportal for Flatpak builds
+
+* Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
+- Update to 40.beta
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (nautilus-3.38.2.tar.xz) = b716140363e6c3ec30ef450958a4d6d812502e96569a9ce2567f56297fd0b3a7e779df6628d447b19dd20b8128a371a523aa5a6e34da40e9466d0b94341ca12c
+SHA512 (nautilus-40.beta.tar.xz) = ce530d3e9f2d43d7c124b882e845ca8d547ee421df1a59130df9f9a18b9c130c76e1b154bf5b3189d59ef599650c3e17ddfc3ac06b700dd9117e17de9d21b07c