diff --git a/.gitignore b/.gitignore index 1095904..9b550f4 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ totem-2.90.5.tar.bz2 /totem-3.23.90.tar.xz /totem-3.24.0.tar.xz /totem-3.25.90.1.tar.xz +/totem-3.26.0.tar.xz diff --git a/0001-lirc-Fix-lirc-plugin-dependency-checks.patch b/0001-lirc-Fix-lirc-plugin-dependency-checks.patch deleted file mode 100644 index 17b913e..0000000 --- a/0001-lirc-Fix-lirc-plugin-dependency-checks.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 09de336619ec177e6943fcc2cb2817f1b4366ea8 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 14 Aug 2017 10:40:46 +0200 -Subject: [PATCH] lirc: Fix lirc plugin dependency checks - -The pkg-config file is called lirc, not lirc_client (the name of the -library), and the function check didn't link against liblirc_client -either. - -https://bugzilla.gnome.org/show_bug.cgi?id=786258 ---- - src/plugins/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/meson.build b/src/plugins/meson.build -index 83d76d86..95af6485 100644 ---- a/src/plugins/meson.build -+++ b/src/plugins/meson.build -@@ -70,8 +70,8 @@ if plugins_option != 'none' - message(str) - endif - -- lirc_dep = dependency('lirc_client', required: false) -- if lirc_dep.found() and cc.has_function('lirc_init') and cc.has_header('lirc/lirc_client.h') -+ lirc_dep = dependency('lirc', required: false) -+ if lirc_dep.found() and cc.has_function('lirc_init', dependencies: lirc_dep) and cc.has_header('lirc/lirc_client.h') - plugins += 'lirc' - else - str = 'you need lirc_client installed for the lirc plugin' --- -2.13.0 - diff --git a/sources b/sources index 6e8691d..d8de3bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (totem-3.25.90.1.tar.xz) = 1cc178c55a98933f2c45e10cd5ced166f360eb950f6fd38ef1a9de0a40b5d59e3aaa2a24d14e057867b28ddb25a1d0bc91b232dced07170d63e59ce4a6a244fc +SHA512 (totem-3.26.0.tar.xz) = 8c010162aefbbba080f6e1f1f2738f957970d8a9fc4510d9a9f56a78e60d69a6b5824664fc04f4cc986877baeef50629e3baa83eaf85bf80a65aa88b9d3df829 diff --git a/totem.spec b/totem.spec index 0a57045..08d5266 100644 --- a/totem.spec +++ b/totem.spec @@ -5,17 +5,14 @@ %global gtk3_version 3.19.4 Name: totem -Version: 3.25.90.1 -Release: 1%{?dist} Epoch: 1 +Version: 3.26.0 +Release: 1%{?dist} Summary: Movie player for GNOME License: GPLv2+ with exceptions URL: https://wiki.gnome.org/Apps/Videos -Source0: https://download.gnome.org/sources/%{name}/3.25/%{name}-%{version}.tar.xz - -# Backported from upstream -Patch0: 0001-lirc-Fix-lirc-plugin-dependency-checks.patch +Source0: https://download.gnome.org/sources/%{name}/3.26/%{name}-%{version}.tar.xz BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(clutter-1.0) @@ -153,8 +150,8 @@ audio and video files in the properties dialog. %find_lang %{name} --with-gnome %check -appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/appdata/*.appdata.xml -desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/org.gnome.Totem.desktop +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Totem.appdata.xml +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Totem.desktop %post /sbin/ldconfig @@ -181,9 +178,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_bindir}/%{name}-video-thumbnailer %{_libdir}/libtotem.so.* %{_libdir}/girepository-1.0/Totem-1.0.typelib -%{_datadir}/appdata/org.gnome.Totem.appdata.xml %{_datadir}/applications/org.gnome.Totem.desktop %{_datadir}/dbus-1/services/org.gnome.Totem.service +%{_datadir}/metainfo/org.gnome.Totem.appdata.xml %dir %{_datadir}/totem %{_datadir}/totem/controls.ui %{_datadir}/totem/playlist.ui @@ -238,6 +235,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gir-1.0/Totem-1.0.gir %changelog +* Mon Sep 11 2017 Kalev Lember - 1:3.26.0-1 +- Update to 3.26.0 + * Wed Aug 16 2017 Kalev Lember - 1:3.25.90.1-1 - Update to 3.25.90.1 - Switch to the meson build system