Compare commits

...

No commits in common. "c8" and "c9s" have entirely different histories.
c8 ... c9s

5 changed files with 357 additions and 22 deletions

View File

@ -1 +1 @@
69954e2dc50a37fd531813739b1bb78cb0dd5070 SOURCES/eog-3.28.4.tar.xz 23257d04ebc650d3edbb504ac6af48937b242461 eog-40.3.tar.xz

151
.gitignore vendored
View File

@ -1 +1,150 @@
SOURCES/eog-3.28.4.tar.xz eog-2.31.4-20100623git.tar.bz2
/eog-2.31.90.tar.bz2
/eog-2.31.91.tar.bz2
/eog-2.32.0.tar.bz2
/eog-2.91.0.tar.bz2
/eog-2.91.1.tar.bz2
/eog-2.91.2.tar.bz2
/eog-2.91.3.tar.bz2
/eog-2.91.5.tar.bz2
/eog-2.91.6.tar.bz2
/eog-2.91.7.tar.bz2
/eog-2.91.90.tar.bz2
/eog-2.91.91.tar.bz2
/eog-2.91.92.tar.bz2
/eog-3.0.0.tar.bz2
/eog-3.0.1.tar.bz2
/eog-3.1.1.tar.bz2
/eog-3.1.2.tar.xz
/eog-3.1.4.tar.xz
/eog-3.1.5.tar.xz
/eog-3.1.90.tar.xz
/eog-3.1.91.tar.xz
/eog-3.1.92.tar.xz
/eog-3.2.0.tar.xz
/eog-3.2.1.tar.xz
/eog-3.3.2.tar.xz
/eog-3.3.3.tar.xz
/eog-3.3.4.tar.xz
/eog-3.3.5.tar.xz
/eog-3.3.90.tar.xz
/eog-3.3.91.tar.xz
/eog-3.3.92.tar.xz
/eog-3.4.0.tar.xz
/eog-3.4.1.tar.xz
/eog-3.5.1.tar.xz
/eog-3.5.2.tar.xz
/eog-3.5.3.tar.xz
/eog-3.5.4.tar.xz
/eog-3.5.90.tar.xz
/eog-3.5.91.tar.xz
/eog-3.5.92.tar.xz
/eog-3.6.0.tar.xz
/eog-3.6.1.tar.xz
/eog-3.7.1.tar.xz
/eog-3.7.2.tar.xz
/eog-3.7.4.tar.xz
/eog-3.7.91.tar.xz
/eog-3.7.92.tar.xz
/eog-3.8.0.tar.xz
/eog-3.8.2.tar.xz
/eog-3.9.1.tar.xz
/eog-3.9.5.tar.xz
/eog-3.9.91.tar.xz
/eog-3.9.92.tar.xz
/eog-3.10.0.tar.xz
/eog-3.10.1.tar.xz
/eog-3.11.1.tar.xz
/eog-3.11.2.tar.xz
/eog-3.11.3.tar.xz
/eog-3.11.4.tar.xz
/eog-3.11.90.tar.xz
/eog-3.11.91.tar.xz
/eog-3.11.92.tar.xz
/eog-3.12.0.tar.xz
/eog-3.12.1.tar.xz
/eog-3.13.1.tar.xz
/eog-3.13.2.tar.xz
/eog-3.13.3.tar.xz
/eog-3.13.90.tar.xz
/eog-3.13.92.tar.xz
/eog-3.14.0.tar.xz
/eog-3.14.1.tar.xz
/eog-3.14.2.tar.xz
/eog-3.14.3.tar.xz
/eog-3.15.1.tar.xz
/eog-3.15.90.tar.xz
/eog-3.15.92.tar.xz
/eog-3.16.0.tar.xz
/eog-3.16.1.tar.xz
/eog-3.16.2.tar.xz
/eog-3.17.1.tar.xz
/eog-3.17.2.tar.xz
/eog-3.17.3.tar.xz
/eog-3.17.90.tar.xz
/eog-3.17.91.tar.xz
/eog-3.17.92.tar.xz
/eog-3.18.0.tar.xz
/eog-3.18.1.tar.xz
/eog-3.19.2.tar.xz
/eog-3.19.3.tar.xz
/eog-3.19.4.tar.xz
/eog-3.19.90.tar.xz
/eog-3.19.91.tar.xz
/eog-3.19.92.tar.xz
/eog-3.20.0.tar.xz
/eog-3.20.1.tar.xz
/eog-3.20.2.tar.xz
/eog-3.20.3.tar.xz
/eog-3.20.4.tar.xz
/eog-3.20.5.tar.xz
/eog-3.23.1.tar.xz
/eog-3.23.90.tar.xz
/eog-3.23.91.tar.xz
/eog-3.23.92.tar.xz
/eog-3.24.0.tar.xz
/eog-3.24.1.tar.xz
/eog-3.25.1.tar.xz
/eog-3.25.90.tar.xz
/eog-3.25.92.tar.xz
/eog-3.26.0.tar.xz
/eog-3.26.1.tar.xz
/eog-3.26.2.tar.xz
/eog-3.27.91.tar.xz
/eog-3.28.0.tar.xz
/eog-3.28.1.tar.xz
/eog-3.28.2.tar.xz
/eog-3.28.3.tar.xz
/eog-3.28.4.tar.xz
/eog-3.31.3.tar.xz
/eog-3.31.90.tar.xz
/eog-3.31.91.tar.xz
/eog-3.32.0.tar.xz
/eog-3.32.1.tar.xz
/eog-3.32.2.tar.xz
/eog-3.33.1.tar.xz
/eog-3.33.2.tar.xz
/eog-3.33.3.tar.xz
/eog-3.33.90.tar.xz
/eog-3.33.91.tar.xz
/eog-3.34.0.tar.xz
/eog-3.34.1.tar.xz
/eog-3.35.1.tar.xz
/eog-3.35.2.tar.xz
/eog-3.35.3.tar.xz
/eog-3.35.91.tar.xz
/eog-3.35.92.tar.xz
/eog-3.36.0.tar.xz
/eog-3.36.1.tar.xz
/eog-3.36.2.tar.xz
/eog-3.37.1.tar.xz
/eog-3.37.90.tar.xz
/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

View File

@ -1,20 +1,20 @@
%global _changelog_trimtime %(date +%s -d "1 year ago")
%define gtk3_version 3.22.0 %define gtk3_version 3.22.0
%define glib2_version 2.42.0 %define glib2_version 2.53.4
%define gnome_desktop_version 2.91.2 %define gnome_desktop_version 2.91.2
%define libexif_version 0.6.14 %define libexif_version 0.6.14
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: eog Name: eog
Version: 3.28.4 Version: 40.3
Release: 1%{?dist} Release: 2%{?dist}
Summary: Eye of GNOME image viewer Summary: Eye of GNOME image viewer
# The GFDL has an "or later version" clause embedded inside the license. # The GFDL has an "or later version" clause embedded inside the license.
# There is no need to add the + here. # There is no need to add the + here.
License: GPLv2+ and GFDL License: GPLv2+ and GFDL
URL: https://wiki.gnome.org/Apps/EyeOfGnome URL: https://wiki.gnome.org/Apps/EyeOfGnome
Source0: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(exempi-2.0)
BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0)
@ -27,6 +27,9 @@ BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libexif) >= %{libexif_version} BuildRequires: pkgconfig(libexif) >= %{libexif_version}
BuildRequires: pkgconfig(libpeas-1.0) >= 0.7.4 BuildRequires: pkgconfig(libpeas-1.0) >= 0.7.4
BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 0.7.4 BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 0.7.4
%if 0%{?flatpak}
BuildRequires: pkgconfig(libportal)
%endif
BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(shared-mime-info)
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
@ -37,13 +40,16 @@ BuildRequires: itstool
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: meson BuildRequires: meson
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: python3-devel
BuildRequires: /usr/bin/appstream-util BuildRequires: /usr/bin/appstream-util
Requires: gsettings-desktop-schemas Requires: gsettings-desktop-schemas
Requires: glib2%{?_isa} >= %{glib2_version} Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gtk3%{?_isa} >= %{gtk3_version} Requires: gtk3%{?_isa} >= %{gtk3_version}
# Contains some files from the Independent JPEG Group's implementation of
# the libjpeg library.
Provides: bundled(libjpeg)
%description %description
The Eye of GNOME image viewer (eog) is the official image viewer for the 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 GNOME desktop. It can view single image files in a variety of formats, as
@ -60,13 +66,32 @@ 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 GNOME desktop. This package allows you to develop plugins that add new
functionality to eog. functionality to eog.
%prep %if !0%{?rhel}
%setup -q %package tests
Summary: Tests for the %{name} package
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: python3-behave
Requires: python3-dogtail
pathfix.py -i %{__python3} -pn meson_post_install.py %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 %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
%meson_build %meson_build
%install %install
@ -76,13 +101,13 @@ pathfix.py -i %{__python3} -pn meson_post_install.py
%check %check
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
desktop-file-validate %{buildroot}/%{_datadir}/applications/eog.desktop desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.eog.desktop
%files -f %{name}.lang %files -f %{name}.lang
%doc AUTHORS NEWS README %doc AUTHORS NEWS README.md
%license COPYING %license COPYING
%{_datadir}/eog %{_datadir}/eog
%{_datadir}/applications/eog.desktop %{_datadir}/applications/org.gnome.eog.desktop
%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/apps/*
%{_bindir}/* %{_bindir}/*
%{_libdir}/eog %{_libdir}/eog
@ -96,20 +121,174 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/eog.desktop
%{_libdir}/pkgconfig/eog.pc %{_libdir}/pkgconfig/eog.pc
%{_datadir}/gtk-doc/ %{_datadir}/gtk-doc/
# tests %if !0%{?rhel}
%exclude %{_libexecdir}/eog/installed-tests/ %files tests
%exclude %{_datadir}/installed-tests/ %dir %{_libexecdir}/eog
%{_libexecdir}/eog/installed-tests/
%{_datadir}/installed-tests/
%endif
%changelog %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
* Tue Dec 01 2020 Felipe Borges <feborges@redhat.com> - 3.38.1-2
- Only require libportal for Flatpak builds
* Wed Nov 25 2020 Kalev Lember <klember@redhat.com> - 3.38.1-1
- Update to 3.38.1
* Sat Sep 12 2020 Kalev Lember <klember@redhat.com> - 3.38.0-1
- Update to 3.38.0
* Sun Sep 06 2020 Kalev Lember <klember@redhat.com> - 3.37.92-1
- Update to 3.37.92
* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 3.37.90-1
- Update to 3.37.90
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.37.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Apr 30 2020 Kalev Lember <klember@redhat.com> - 3.37.1-1
- Update to 3.37.1
* Sat Apr 25 2020 Kalev Lember <klember@redhat.com> - 3.36.2-1
- Update to 3.36.2
* Tue Apr 14 2020 Felipe Borges <feborges@redhat.com> - 3.36.1-3
- Also use Portals for the right-click "Open with" option
* Fri Apr 03 2020 Felipe Borges <feborges@redhat.com> - 3.36.1-2
- Use Portals for "open with"
* Sun Mar 29 2020 Kalev Lember <klember@redhat.com> - 3.36.1-1
- Update to 3.36.1
* Sun Mar 08 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
- Update to 3.36.0
* Mon Mar 02 2020 Kalev Lember <klember@redhat.com> - 3.35.92-1
- Update to 3.35.92
* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 3.35.91-1
- Update to 3.35.91
* Sun Feb 02 2020 Kalev Lember <klember@redhat.com> - 3.35.3-1
- Update to 3.35.3
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 20 2020 Kalev Lember <klember@redhat.com> - 3.35.2-1
- Update to 3.35.2
* Thu Jan 16 2020 Kalev Lember <klember@redhat.com> - 3.35.1-2
- Rebuilt for libgnome-desktop soname bump
* Mon Dec 02 2019 Kalev Lember <klember@redhat.com> - 3.35.1-1
- Update to 3.35.1
* Mon Oct 07 2019 Kalev Lember <klember@redhat.com> - 3.34.1-1
- Update to 3.34.1
* Wed Sep 11 2019 Kalev Lember <klember@redhat.com> - 3.34.0-2
- Change -tests subpackage to depend on python3 instead of python2
* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
- Update to 3.34.0
* Fri Sep 06 2019 Nikola Forró <nforro@redhat.com> - 3.33.91-3
- Rebuilt for exempi 2.5.1
* Tue Aug 20 2019 Kalev Lember <klember@redhat.com> - 3.33.91-2
- Rebuild
* Tue Aug 20 2019 Kalev Lember <klember@redhat.com> - 3.33.91-1
- Update to 3.33.91
* Tue Aug 06 2019 Phil Wyett <philwyett@kathenas.org> - 3.33.90-1
- Update to 3.33.90.
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.33.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Jul 21 2019 Kalev Lember <klember@redhat.com> - 3.33.3-2
- Rebuilt for libgnome-desktop soname bump
* Mon Jul 15 2019 Kalev Lember <klember@redhat.com> - 3.33.3-1
- Update to 3.33.3
* Tue Jun 18 2019 Kalev Lember <klember@redhat.com> - 3.33.2-1
- Update to 3.33.2
* Tue May 21 2019 Kalev Lember <klember@redhat.com> - 3.33.1-1
- Update to 3.33.1
* Tue May 21 2019 Kalev Lember <klember@redhat.com> - 3.32.2-1
- Update to 3.32.2
* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 3.32.1-2
- Rebuild with Meson fix for #1699099
* Mon Apr 08 2019 Kalev Lember <klember@redhat.com> - 3.32.1-1
- Update to 3.32.1
* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
- Update to 3.32.0
* Mon Mar 04 2019 Kalev Lember <klember@redhat.com> - 3.31.91-1
- Update to 3.31.91
* Mon Feb 04 2019 Phil Wyett <philwyett@kathenas.org> - 3.31.90-1
- Update to 3.31.90
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jan 07 2019 Kalev Lember <klember@redhat.com> - 3.31.3-1
- Update to 3.31.3
* Wed Sep 26 2018 Kalev Lember <klember@redhat.com> - 3.28.4-1 * Wed Sep 26 2018 Kalev Lember <klember@redhat.com> - 3.28.4-1
- Update to 3.28.4 - Update to 3.28.4
* Wed Jul 25 2018 Kalev Lember <klember@redhat.com> - 3.28.3-1 * Wed Jul 25 2018 Kalev Lember <klember@redhat.com> - 3.28.3-1
- Update to 3.28.3 - Update to 3.28.3
* Wed May 30 2018 Petr Viktorin <pviktori@redhat.com> - 3.28.1-3 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-2
- Drop the tests subpackage - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
https://bugzilla.redhat.com/show_bug.cgi?id=1567331
* Tue May 08 2018 Kalev Lember <klember@redhat.com> - 3.28.2-1
- Update to 3.28.2
* Fri Apr 13 2018 Kalev Lember <klember@redhat.com> - 3.28.1-2 * Fri Apr 13 2018 Kalev Lember <klember@redhat.com> - 3.28.1-2
- Fix -test subpackage deps - Fix -test subpackage deps

6
gating.yaml Normal file
View File

@ -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}

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (eog-40.3.tar.xz) = 5c6af597b35adcc18846e2dbee80eaf4b3c07138826520a9f6c2567df50c20379f804f8b878c7da74dd6cab25249555113d785653c0239353e410506611ffbab