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/eog.git#04aa48023e6d4ab392713d673ffced8081a6b6c6

eog.spec

@@ -7,7 +7,7 @@
 
 Name:    eog
 Version: 40~beta
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Eye of GNOME image viewer
 
 # The GFDL has an "or later version" clause embedded inside the license.
@@ -62,6 +62,7 @@ The Eye of GNOME image viewer (eog) is the official image viewer for the
 GNOME desktop. This package allows you to develop plugins that add new
 functionality to eog.
 
+%if !0%{?rhel}
 %package  tests
 Summary:  Tests for the %{name} package
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -71,12 +72,19 @@ Requires: python3-dogtail
 %description tests
 The %{name}-tests package contains tests that can be used to verify
 the functionality of the installed %{name} package.
+%endif
 
 %prep
 %autosetup -p1 -n %{name}-%{tarball_version}
 
 %build
-%meson -Dgtk_doc=true -Dinstalled_tests=true \
+%meson \
+       -Dgtk_doc=true \
+    %if 0%{?rhel}
+       -Dinstalled_tests=false \
+    %else
+       -Dinstalled_tests=true \
+    %endif
     %if ! 0%{?flatpak}
        -Dlibportal=false
     %endif
@@ -109,12 +117,17 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.eog.deskto
 %{_libdir}/pkgconfig/eog.pc
 %{_datadir}/gtk-doc/
 
+%if !0%{?rhel}
 %files tests
 %dir %{_libexecdir}/eog
 %{_libexecdir}/eog/installed-tests/
 %{_datadir}/installed-tests/
+%endif
 
 %changelog
+* Fri Feb 19 2021 Kalev Lember <klember@redhat.com> - 40~beta-2
+- Disable installed tests on RHEL
+
 * Thu Feb 18 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
 - Update to 40.beta