From 6df2d24b258c3036d82bf33e074b9c6aaa874588 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 18 Feb 2021 20:10:54 +0000 Subject: [PATCH] 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#6e951481147f419058c538cb12ce9f123fb679b6 --- .gitignore | 1 + eog.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a8dab1f..dbc667b 100644 --- a/.gitignore +++ b/.gitignore @@ -142,3 +142,4 @@ 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 diff --git a/eog.spec b/eog.spec index 57908bc..1030603 100644 --- a/eog.spec +++ b/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~beta +Release: 1%{?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) @@ -73,7 +73,7 @@ The %{name}-tests package contains tests that can be used to verify the functionality of the installed %{name} package. %prep -%setup -q +%autosetup -p1 -n %{name}-%{tarball_version} %build %meson -Dgtk_doc=true -Dinstalled_tests=true \ @@ -92,7 +92,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 @@ -115,6 +115,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.eog.deskto %{_datadir}/installed-tests/ %changelog +* Thu Feb 18 2021 Kalev Lember - 40~beta-1 +- Update to 40.beta + * Tue Jan 26 2021 Fedora Release Engineering - 3.38.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 57920f1..7beb151 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (eog-3.38.1.tar.xz) = 26317413271001b4edcd30438e81a2bb1d2e10edd639c054ffdc08743a5274b27afb51186a660e29022be5e9ecf10043b94e7d409194589d2bba6906ede2cff9 +SHA512 (eog-40.beta.tar.xz) = c53dda92d039bd6f8a0533787ef05152fac1740d8f092cc9fc6361f3369c9b3bfd1f93a0f889cacbf985388825cd8c74938971735260732cea5e0cadd9036a3e