From 654f5c2ec6d4e5bcee3a9fc5df59ee30dd7fee65 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Sun, 28 Mar 2021 20:10:18 +0000
Subject: [PATCH] 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/gnome-photos.git#98e29631876a21b6db346561acf46d38ccb5ea19
---
 .gitignore        |  1 +
 gnome-photos.spec | 16 +++++++++++++---
 sources           |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3e82250..12dbd99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,3 +94,4 @@
 /gnome-photos-3.38.1.tar.xz
 /gnome-photos-40.beta.tar.xz
 /gnome-photos-40.rc.tar.xz
+/gnome-photos-40.0.tar.xz
diff --git a/gnome-photos.spec b/gnome-photos.spec
index 1ad4cff..a51fbc8 100644
--- a/gnome-photos.spec
+++ b/gnome-photos.spec
@@ -17,8 +17,8 @@
 %global tracker_miners_version 3.0.0
 
 Name:          gnome-photos
-Version:       40~rc
-Release:       2%{?dist}
+Version:       40.0
+Release:       1%{?dist}
 Summary:       Access, organize and share your photos on GNOME
 
 # GNOME Photos itself is GPLv3+, but the bundled libgd is LGPLv2+
@@ -63,7 +63,11 @@ Requires:      gdk-pixbuf2%{?isa} >= %{gdk_pixbuf_version}
 Requires:      gegl04%{?_isa} >= %{gegl_version}
 Requires:      gfbgraph%{?_isa} >= %{gfbgraph_version}
 Requires:      glib2%{?isa} >= %{glib2_version}
+
+%if 0%{?fedora} || 0%{?rhel} < 9
 Requires:      gnome-online-miners >= 3.11.3
+%endif
+
 Requires:      gnome-settings-daemon
 Requires:      grilo%{?_isa} >= %{grilo_version}
 Requires:      gtk3%{?_isa} >= %{gtk3_version}
@@ -164,7 +168,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Photos.desk
 
 
 %changelog
-* Fri Mar 19 2021 Debarshi Ray <rishi@fedoraproject.org> - 40~rc-1
+* Thu Mar 25 2021 Kalev Lember <klember@redhat.com> - 40.0-1
+- Update to 40.0
+
+* Mon Mar 22 2021 Debarshi Ray <rishi@fedoraproject.org> - 40~rc-3
+- The gnome-online-miners package won't be part of RHEL 9
+
+* Fri Mar 19 2021 Debarshi Ray <rishi@fedoraproject.org> - 40~rc-2
 - Update to 40.rc
 
 * Fri Mar 12 2021 Debarshi Ray <rishi@fedoraproject.org> - 40~beta-2
diff --git a/sources b/sources
index 3ac98dd..3a8f33b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-photos-40.rc.tar.xz) = 484d0d55634327be7a4722a0f783cf24c20583fa160f6b18b1c6e287e758d4f85e153ff41d356e6e314f1da7fe71b44c051881b7f30164619a42198d6cd75a99
+SHA512 (gnome-photos-40.0.tar.xz) = 70641e7fc6375e15cadc62ad75804d3ffb1d2193dd0bbed21b291b38f1d271ba7d34a4714a1658b9f13345f20e421190958b4713aae64f4f46913628079ba814