Compare commits

..

No commits in common. "300e6e15578353a1f83b5b4bf65a8e9b817dcd87" and "fc661c164acdfd26cd3674f845234bdb2632d539" have entirely different histories.

5 changed files with 9 additions and 65 deletions

View File

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

6
.gitignore vendored
View File

@ -142,9 +142,3 @@ eog-2.31.4-20100623git.tar.bz2
/eog-3.37.92.tar.xz /eog-3.37.92.tar.xz
/eog-3.38.0.tar.xz /eog-3.38.0.tar.xz
/eog-3.38.1.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.53.4 %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: 40.3 Version: 3.38.1
Release: 2%{?dist} Release: 3%{?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: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz Source0: https://download.gnome.org/sources/%{name}/3.38/%{name}-%{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)
@ -46,10 +46,6 @@ 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
@ -66,7 +62,6 @@ 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.
%if !0%{?rhel}
%package tests %package tests
Summary: Tests for the %{name} package Summary: Tests for the %{name} package
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
@ -76,19 +71,12 @@ Requires: python3-dogtail
%description tests %description tests
The %{name}-tests package contains tests that can be used to verify The %{name}-tests package contains tests that can be used to verify
the functionality of the installed %{name} package. the functionality of the installed %{name} package.
%endif
%prep %prep
%autosetup -p1 -n %{name}-%{tarball_version} %setup -q
%build %build
%meson \ %meson -Dgtk_doc=true -Dinstalled_tests=true \
-Dgtk_doc=true \
%if 0%{?rhel}
-Dinstalled_tests=false \
%else
-Dinstalled_tests=true \
%endif
%if ! 0%{?flatpak} %if ! 0%{?flatpak}
-Dlibportal=false -Dlibportal=false
%endif %endif
@ -104,7 +92,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdat
desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.eog.desktop desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.eog.desktop
%files -f %{name}.lang %files -f %{name}.lang
%doc AUTHORS NEWS README.md %doc AUTHORS NEWS README
%license COPYING %license COPYING
%{_datadir}/eog %{_datadir}/eog
%{_datadir}/applications/org.gnome.eog.desktop %{_datadir}/applications/org.gnome.eog.desktop
@ -121,43 +109,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.eog.deskto
%{_libdir}/pkgconfig/eog.pc %{_libdir}/pkgconfig/eog.pc
%{_datadir}/gtk-doc/ %{_datadir}/gtk-doc/
%if !0%{?rhel}
%files tests %files tests
%dir %{_libexecdir}/eog %dir %{_libexecdir}/eog
%{_libexecdir}/eog/installed-tests/ %{_libexecdir}/eog/installed-tests/
%{_datadir}/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 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

View File

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

View File

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