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#b87d47e340bdd68df83f61a318b7a6ad046e71ba

.gitignore

@@ -93,3 +93,4 @@
 /gnome-photos-3.38.0.tar.xz
 /gnome-photos-3.38.1.tar.xz
 /gnome-photos-40.beta.tar.xz
+/gnome-photos-40.rc.tar.xz

gnome-photos.spec

@@ -17,8 +17,8 @@
 %global tracker_miners_version 3.0.0
 
 Name:          gnome-photos
-Version:       40~beta
-Release:       1%{?dist}
+Version:       40~rc
+Release:       2%{?dist}
 Summary:       Access, organize and share your photos on GNOME
 
 # GNOME Photos itself is GPLv3+, but the bundled libgd is LGPLv2+
@@ -108,6 +108,11 @@ This package contains the installable tests for %{name}.
   -Ddogtail=true \
 %else
   -Ddogtail=false \
+%endif
+%if 0%{?flatpak}
+  -Dflatpak=true \
+%else
+  -Dflatpak=false \
 %endif
   -Dinstalled_tests=true \
   -Dmanuals=true \
@@ -118,10 +123,6 @@ This package contains the installable tests for %{name}.
 %install
 %meson_install
 
-rm -rf %{buildroot}%{_datadir}/dbus-1/services/org.gnome.Photos.Tracker3.Miner.Extract.service
-rm -rf %{buildroot}%{_datadir}/dbus-1/services/org.gnome.Photos.Tracker3.Miner.Files.service
-rm -rf %{buildroot}%{_datadir}/tracker3-miners
-
 # Upstream doesn't install with desktop-file-install, so let's check
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Photos.desktop
 
@@ -134,11 +135,22 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Photos.desk
 %{_datadir}/metainfo/org.gnome.Photos.appdata.xml
 %{_datadir}/applications/org.gnome.Photos.desktop
 %{_datadir}/dbus-1/services/org.gnome.Photos.service
+
+%if 0%{?flatpak}
+%{_datadir}/dbus-1/services/org.gnome.Photos.Tracker3.Miner.Extract.service
+%{_datadir}/dbus-1/services/org.gnome.Photos.Tracker3.Miner.Files.service
+%endif
+
 %{_datadir}/glib-2.0/schemas/org.gnome.photos.gschema.xml
 %{_datadir}/gnome-shell/
 %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Photos.svg
 %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Photos-symbolic.svg
 %{_datadir}/man/man1/%{name}.1*
+
+%if 0%{?flatpak}
+%{_datadir}/tracker3-miners/domain-ontologies/org.gnome.Photos.rule
+%endif
+
 %{_docdir}/%{name}
 
 %dir %{_libdir}/%{name}
@@ -152,6 +164,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Photos.desk
 
 
 %changelog
+* Fri Mar 19 2021 Debarshi Ray <rishi@fedoraproject.org> - 40~rc-1
+- Update to 40.rc
+
+* Fri Mar 12 2021 Debarshi Ray <rishi@fedoraproject.org> - 40~beta-2
+- Unbreak Flatpak builds on hosts without Tracker 3
+
 * Fri Mar 12 2021 Debarshi Ray <rishi@fedoraproject.org> - 40~beta-1
 - Update to 40.beta
 

sources

@@ -1 +1 @@
-SHA512 (gnome-photos-40.beta.tar.xz) = c608e51f4d162260c10c9d06bf8e4c79116be84e40bacdb170d8921605bf23d45d400e8ff951025a38ac32545360578747b26c0f3b2b5e9126bd6d4e34a1d28a
+SHA512 (gnome-photos-40.rc.tar.xz) = 484d0d55634327be7a4722a0f783cf24c20583fa160f6b18b1c6e287e758d4f85e153ff41d356e6e314f1da7fe71b44c051881b7f30164619a42198d6cd75a99