Add 'Provides: bundled(libjpeg)'

Resolves: #1993759

.eog.metadata

@@ -0,0 +1 @@
+23257d04ebc650d3edbb504ac6af48937b242461 eog-40.3.tar.xz

.gitignore

@@ -142,3 +142,9 @@ eog-2.31.4-20100623git.tar.bz2
 /eog-3.37.92.tar.xz
 /eog-3.38.0.tar.xz
 /eog-3.38.1.tar.xz
+/eog-40.beta.tar.xz
+/eog-40.rc.tar.xz
+/eog-40.0.tar.xz
+/eog-40.1.tar.xz
+/eog-40.2.tar.xz
+/eog-40.3.tar.xz

eog.spec

@@ -1,20 +1,20 @@
-%global _changelog_trimtime %(date +%s -d "1 year ago")
-
 %define gtk3_version 3.22.0
 %define glib2_version 2.53.4
 %define gnome_desktop_version 2.91.2
 %define libexif_version 0.6.14
 
+%global tarball_version %%(echo %{version} | tr '~' '.')
+
 Name:    eog
-Version: 3.38.1
-Release: 3%{?dist}
+Version: 40.3
+Release: 2%{?dist}
 Summary: Eye of GNOME image viewer
 
 # The GFDL has an "or later version" clause embedded inside the license.
 # There is no need to add the + here.
 License: GPLv2+ and GFDL
 URL:     https://wiki.gnome.org/Apps/EyeOfGnome
-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: pkgconfig(exempi-2.0)
 BuildRequires: pkgconfig(gdk-pixbuf-2.0)
@@ -46,6 +46,10 @@ Requires:      gsettings-desktop-schemas
 Requires:      glib2%{?_isa} >= %{glib2_version}
 Requires:      gtk3%{?_isa} >= %{gtk3_version}
 
+# Contains some files from the Independent JPEG Group's implementation of
+# the libjpeg library.
+Provides:      bundled(libjpeg)
+
 %description
 The Eye of GNOME image viewer (eog) is the official image viewer for the
 GNOME desktop. It can view single image files in a variety of formats, as
@@ -62,6 +66,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 +76,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
-%setup -q
+%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
@@ -92,7 +104,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdat
 desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.eog.desktop
 
 %files -f %{name}.lang
-%doc AUTHORS NEWS README
+%doc AUTHORS NEWS README.md
 %license COPYING
 %{_datadir}/eog
 %{_datadir}/applications/org.gnome.eog.desktop
@@ -109,12 +121,43 @@ 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 Aug 27 2021 Debarshi Ray <rishi@fedoraproject.org> - 40.3-2
+- Add 'Provides: bundled(libjpeg)'
+Resolves: #1998486
+
+* Sun Aug 15 2021 Kalev Lember <klember@redhat.com> - 40.3-1
+- Update to 40.3
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 40.1-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed May 05 2021 Kalev Lember <klember@redhat.com> - 40.1-1
+- Update to 40.1
+
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 40.0-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 40.0-1
+- Update to 40.0
+
+* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 40~rc-1
+- Update to 40.rc
+
+* 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
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

sources

@@ -1 +1 @@
-SHA512 (eog-3.38.1.tar.xz) = 26317413271001b4edcd30438e81a2bb1d2e10edd639c054ffdc08743a5274b27afb51186a660e29022be5e9ecf10043b94e7d409194589d2bba6906ede2cff9
+SHA512 (eog-40.3.tar.xz) = 5c6af597b35adcc18846e2dbee80eaf4b3c07138826520a9f6c2567df50c20379f804f8b878c7da74dd6cab25249555113d785653c0239353e410506611ffbab