From ba698c99c8c4e66272ae629c516ce6da7f7d6981f4655f0a5f1188533ea82e29 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 3 Jul 2017 13:26:51 +0000 Subject: [PATCH] Accepting request 507342 from home:wolfi323:branches:KDE:Extra - Update to 2.0.10: * Fix video resize and scale factor issues; * Handle parameters when there's a running instance and a new kaffeine is called with some URL. * Updated scanfile.dvb. - Drop remove-stray-call-to-ki18n_install.patch, no longer necessary OBS-URL: https://build.opensuse.org/request/show/507342 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kaffeine?expand=0&rev=25 --- kaffeine-2.0.10.tar.xz | 3 +++ kaffeine-2.0.9.tar.xz | 3 --- kaffeine.changes | 11 +++++++++++ kaffeine.spec | 6 ++---- remove-stray-call-to-ki18n_install.patch | 22 ---------------------- 5 files changed, 16 insertions(+), 29 deletions(-) create mode 100644 kaffeine-2.0.10.tar.xz delete mode 100644 kaffeine-2.0.9.tar.xz delete mode 100644 remove-stray-call-to-ki18n_install.patch diff --git a/kaffeine-2.0.10.tar.xz b/kaffeine-2.0.10.tar.xz new file mode 100644 index 0000000..2554b95 --- /dev/null +++ b/kaffeine-2.0.10.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc8c0a8a6e360d3a45a1e3ea5b98fa730cad164451b5ed54620d0b91b0f614c3 +size 4405388 diff --git a/kaffeine-2.0.9.tar.xz b/kaffeine-2.0.9.tar.xz deleted file mode 100644 index 04a94fa..0000000 --- a/kaffeine-2.0.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac53b697bba4fa97350706698c777908c21c464f7c567fe1a4ce9352e955754f -size 4398832 diff --git a/kaffeine.changes b/kaffeine.changes index dbc23f1..dff1f9e 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Jun 30 11:48:07 UTC 2017 - wbauer@tmo.at + +- Update to 2.0.10: + * Fix video resize and scale factor issues; + * Handle parameters when there's a running instance and a new + kaffeine is called with some URL. + * Updated scanfile.dvb. +- Drop remove-stray-call-to-ki18n_install.patch, no longer + necessary + ------------------------------------------------------------------- Sun Jun 4 07:18:47 UTC 2017 - wbauer@tmo.at diff --git a/kaffeine.spec b/kaffeine.spec index 955e678..4449092 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -20,14 +20,12 @@ Name: kaffeine Summary: VLC-based Multimedia Player License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players -Version: 2.0.9 +Version: 2.0.10 Release: 0 Url: http://kaffeine.kde.org/ Source0: %{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE kaffeine-fixsplitter.patch -- GUI improvement (allow more flexibly set splitters) Patch0: kaffeine-fixsplitter.patch -# PATCH-FIX-OPENSUSE remove-stray-call-to-ki18n_install.patch -- fixes the build with KDE Frameworks 5.34 -Patch1: remove-stray-call-to-ki18n_install.patch Recommends: %{name}-lang = %version Requires: libQt5Sql5-sqlite Requires: vlc-noX @@ -44,6 +42,7 @@ BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5Solid) BuildRequires: cmake(KF5WidgetsAddons) +BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(KF5XmlGui) %if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120300) BuildRequires: pkgconfig(libdvbv5) @@ -69,7 +68,6 @@ playing their movies: from DVD (including DVD menus, titles, chapters, etc.), VC %prep %setup -q %patch0 -%patch1 -p1 %build %cmake_kf5 -d build diff --git a/remove-stray-call-to-ki18n_install.patch b/remove-stray-call-to-ki18n_install.patch deleted file mode 100644 index 927547b..0000000 --- a/remove-stray-call-to-ki18n_install.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Wolfgang Bauer -Date: Sun, 04 Jun 2017 09:16:09 +0200 -Subject: Remove stray/duplicated call to ki18n_install - -The release script injected an additional ki18n_install(po), but this -breaks the build with KDE Frameworks 5.34 (cmake error "another target -with the same name already exists") because ki18n_install(po) is -already called anyway. - -So remove it to fix the build. ---- -diff -u a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -107,7 +107,5 @@ - if(BUILD_TOOLS) - add_subdirectory(tools) - endif(BUILD_TOOLS) --find_package(KF5I18n CONFIG REQUIRED) --ki18n_install(po) - find_package(KF5DocTools CONFIG REQUIRED) - kdoctools_install(po)