diff --git a/.eog.metadata b/.eog.metadata index 747eca3..61abb36 100644 --- a/.eog.metadata +++ b/.eog.metadata @@ -1 +1 @@ -145d848ee3ce7fa9668f14a837c8add28af70b92 SOURCES/eog-3.20.5.tar.xz +b7604e241b98bb3c31f4b94b4fcd13c4a3c7b891 SOURCES/eog-3.28.3.tar.xz diff --git a/.gitignore b/.gitignore index 6f8e9ba..0d33e92 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/eog-3.20.5.tar.xz +SOURCES/eog-3.28.3.tar.xz diff --git a/SOURCES/no-python3.patch b/SOURCES/no-python3.patch new file mode 100644 index 0000000..f3c5791 --- /dev/null +++ b/SOURCES/no-python3.patch @@ -0,0 +1,9 @@ +diff -urNp eog-3.28.2.old/meson_post_install.py eog-3.28.2/meson_post_install.py +--- eog-3.28.2.old/meson_post_install.py 2018-06-06 13:46:11.628471844 +0100 ++++ eog-3.28.2/meson_post_install.py 2018-06-06 13:46:28.523417819 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/env python + + import os + import subprocess diff --git a/SPECS/eog.spec b/SPECS/eog.spec index edf513c..27144a7 100644 --- a/SPECS/eog.spec +++ b/SPECS/eog.spec @@ -1,20 +1,22 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") -%define gtk3_version 3.19.3 +%define gtk3_version 3.22.0 %define glib2_version 2.42.0 %define gnome_desktop_version 2.91.2 %define libexif_version 0.6.14 Name: eog -Version: 3.20.5 -Release: 2%{?dist} +Version: 3.28.3 +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: http://download.gnome.org/sources/%{name}/3.20/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz + +Patch1: no-python3.patch BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) @@ -32,9 +34,10 @@ BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(x11) BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: intltool >= 0.50.1 +BuildRequires: gtk-doc BuildRequires: itstool BuildRequires: libjpeg-devel +BuildRequires: meson BuildRequires: zlib-devel BuildRequires: /usr/bin/appstream-util @@ -60,24 +63,21 @@ functionality to eog. %prep %setup -q +%patch1 -p1 -b .no-py3 %build -%configure -make %{?_smp_mflags} +%meson -Dgtk_doc=true -Dinstalled_tests=false +%meson_build %install -%make_install +%meson_install %find_lang %{name} --with-gnome -rm -rf $RPM_BUILD_ROOT%{_libdir}/eog/plugins/*.la - - %check -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml desktop-file-validate %{buildroot}/%{_datadir}/applications/eog.desktop - %post update-desktop-database >&/dev/null || : touch %{_datadir}/icons/hicolor >&/dev/null || : @@ -103,9 +103,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || : %{_bindir}/* %{_libdir}/eog %{_datadir}/GConf/gsettings/eog.convert -%{_datadir}/appdata/eog.appdata.xml %{_datadir}/glib-2.0/schemas/org.gnome.eog.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.eog.gschema.xml +%{_datadir}/metainfo/eog.appdata.xml %files devel %{_includedir}/eog-3.0 @@ -113,6 +113,14 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || : %{_datadir}/gtk-doc/ %changelog +* Wed Jul 25 2018 Kalev Lember - 3.28.3-1 +- Update to 3.28.3 +- Resolves: #1567185 + +* Wed Jun 06 2018 Richard Hughes - 3.28.2-1 +- Update to 3.28.2 +- Resolves: #1567185 + * Tue Apr 18 2017 Richard Hughes - 3.20.5-2 - Do not build the tests subpackage, the required deps are not available. - Resolves: #1433402