From a8722273077c70981c19098e843b93764703cc33 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 5 Mar 2018 22:58:55 +0100 Subject: [PATCH] Update to 3.27.91 - Switch to the meson build system --- .gitignore | 1 + eog.spec | 25 ++++++++++++++----------- sources | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index fb97f88..ef6c700 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ eog-2.31.4-20100623git.tar.bz2 /eog-3.26.0.tar.xz /eog-3.26.1.tar.xz /eog-3.26.2.tar.xz +/eog-3.27.91.tar.xz diff --git a/eog.spec b/eog.spec index eccea9d..536e088 100644 --- a/eog.spec +++ b/eog.spec @@ -6,15 +6,15 @@ %define libexif_version 0.6.14 Name: eog -Version: 3.26.2 -Release: 4%{?dist} +Version: 3.27.91 +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.26/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/3.27/%{name}-%{version}.tar.xz BuildRequires: pkgconfig(exempi-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) @@ -32,9 +32,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 @@ -72,18 +73,16 @@ the functionality of the installed %{name} package. %setup -q %build -%configure --enable-installed-tests -make %{?_smp_mflags} +%meson -Dgtk_doc=true -Dinstalled_tests=true +%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 %files -f %{name}.lang @@ -95,9 +94,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/eog.desktop %{_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 @@ -110,6 +109,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/eog.desktop %{_datadir}/installed-tests/ %changelog +* Mon Mar 05 2018 Kalev Lember - 3.27.91-1 +- Update to 3.27.91 +- Switch to the meson build system + * Tue Feb 13 2018 Björn Esser - 3.26.2-4 - Rebuild against newer gnome-desktop3 package diff --git a/sources b/sources index b7efc36..8c4dc4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (eog-3.26.2.tar.xz) = 40941d77739d1ed572dd7c4864435e5944c9dd48f5386b2ea11e16da52f7fa550844e4636ee35947172e921df596542d13928c79f7f511ef70ec92b832b1f1db +SHA512 (eog-3.27.91.tar.xz) = 6bf742909bd1e0abe75e85536fd359f8006d7d5e757eab1c1a3b3cfadf6859f9bd19111e39d34dca61a28706ece547482159f04431f37890cff73fb0529dcd23