From adda97215dad66a41c227572036d6103a50f8a058f81c9417607176d0816909e Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Wed, 2 May 2018 09:02:24 +0000
Subject: [PATCH] Accepting request 602990 from
 home:wolfi323:branches:KDE:Extra

- Update to 2.0.15:
  * Fix logic that handles ATSC EIT entries (regression fix)
    (kde#388962)
  * Auto-hide all bars when in minimal/full screen mode and mouse
    is out of window
  * Allow better control of deinterlacing mode (kde#389783)
  * Better handle higherVoltage settings, as it exists only for
    satellite TV delivery systems (kde#388367)
  * Improve error handling when parsing config.dvb file
    (kde#388367)
  * Change volume wheel logic to accept both point and angle-based
    volume control, accepting it only when the mouse is under the
    media widget
  * Simplify the mouse hide logic
  * Fix DVD menu navigation by using the keyboard instead of the
    mouse (as mouse control is incompatible with newer versions of
    Qt/libVLC) (kde#373814)
  * Fix handling of display mode, correcting some erratic behavior
    (kde#393533)
  * Add options to start Kaffeine on minimal mode and/or with its
    main window always on top
  * When a new record starts and there aren't enough resources to
    keep playing the current DVB channel, switch to the new channel
    instead of stop playing (kde#393647)
  * Improve documentation to match the recent changes
- Drop fix-pt_BR-docs.patch, merged upstream

OBS-URL: https://build.opensuse.org/request/show/602990
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kaffeine?expand=0&rev=35
---
 fix-pt_BR-docs.patch   | 79 ------------------------------------------
 kaffeine-2.0.14.tar.xz |  3 --
 kaffeine-2.0.15.tar.xz |  3 ++
 kaffeine.changes       | 30 ++++++++++++++++
 kaffeine.spec          |  7 ++--
 5 files changed, 35 insertions(+), 87 deletions(-)
 delete mode 100644 fix-pt_BR-docs.patch
 delete mode 100644 kaffeine-2.0.14.tar.xz
 create mode 100644 kaffeine-2.0.15.tar.xz

diff --git a/fix-pt_BR-docs.patch b/fix-pt_BR-docs.patch
deleted file mode 100644
index 73a23bf..0000000
--- a/fix-pt_BR-docs.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- trunk/po/pt_BR/docs/kaffeine/index.docbook	2017/11/30 09:29:15	1505509
-+++ trunk/po/pt_BR/docs/kaffeine/index.docbook	2017/12/07 13:06:40	1506003
-@@ -988,7 +988,9 @@
- ><menuchoice
- ><shortcut
- > <keycombo action="simul"
-->&PgUp;</keycombo
-+><keysym
-+>PgUp</keysym
-+></keycombo
- > </shortcut
- > <guimenu
- >Reproduzir</guimenu
-@@ -1013,7 +1015,9 @@
- ><menuchoice
- ><shortcut
- > <keycombo action="simul"
-->&Space;</keycombo
-+><keysym
-+>Espaço</keysym
-+></keycombo
- > </shortcut
- > <guimenu
- >Reproduzir</guimenu
-@@ -1071,7 +1075,9 @@
- ><menuchoice
- ><shortcut
- > <keycombo action="simul"
-->&PgDn;</keycombo
-+><keysym
-+>PgDn</keysym
-+></keycombo
- > </shortcut
- > <guimenu
- >Reproduzir</guimenu
-@@ -1466,7 +1472,9 @@
- ><menuchoice
- ><shortcut
- > <keycombo action="simul"
-->&Shift;&Left;</keycombo
-+>&Shift;<keysym
-+>←</keysym
-+></keycombo
- > </shortcut
- > <guimenu
- >Reproduzir</guimenu
-@@ -1493,7 +1501,9 @@
- ><menuchoice
- ><shortcut
- > <keycombo action="simul"
-->&Left;</keycombo
-+><keysym
-+>←</keysym
-+></keycombo
- > </shortcut
- > <guimenu
- >Reproduzir</guimenu
-@@ -1520,7 +1530,9 @@
- ><menuchoice
- ><shortcut
- > <keycombo action="simul"
-->&Right;</keycombo
-+><keysym
-+>→</keysym
-+></keycombo
- > </shortcut
- > <guimenu
- >Reproduzir</guimenu
-@@ -1547,7 +1559,9 @@
- ><menuchoice
- ><shortcut
- > <keycombo action="simul"
-->&Shift;&Right;</keycombo
-+>&Shift;<keysym
-+>→</keysym
-+></keycombo
- > </shortcut
- > <guimenu
- >Reproduzir</guimenu
diff --git a/kaffeine-2.0.14.tar.xz b/kaffeine-2.0.14.tar.xz
deleted file mode 100644
index 4cb53f4..0000000
--- a/kaffeine-2.0.14.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c73fd473f0579cffa7e797e3d00c41b09d7fb4dee486bb507877a56bd1d7f3a
-size 5972768
diff --git a/kaffeine-2.0.15.tar.xz b/kaffeine-2.0.15.tar.xz
new file mode 100644
index 0000000..9e94622
--- /dev/null
+++ b/kaffeine-2.0.15.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e61573199fe4e04377679a5cf8b32b3aa0bb4201c56371e11820d3a3ae41904d
+size 5988584
diff --git a/kaffeine.changes b/kaffeine.changes
index 78c15ce..1866a55 100644
--- a/kaffeine.changes
+++ b/kaffeine.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Wed May  2 08:32:54 UTC 2018 - wbauer@tmo.at
+
+- Update to 2.0.15:
+  * Fix logic that handles ATSC EIT entries (regression fix)
+    (kde#388962)
+  * Auto-hide all bars when in minimal/full screen mode and mouse
+    is out of window
+  * Allow better control of deinterlacing mode (kde#389783)
+  * Better handle higherVoltage settings, as it exists only for
+    satellite TV delivery systems (kde#388367)
+  * Improve error handling when parsing config.dvb file
+    (kde#388367)
+  * Change volume wheel logic to accept both point and angle-based
+    volume control, accepting it only when the mouse is under the
+    media widget
+  * Simplify the mouse hide logic
+  * Fix DVD menu navigation by using the keyboard instead of the
+    mouse (as mouse control is incompatible with newer versions of
+    Qt/libVLC) (kde#373814)
+  * Fix handling of display mode, correcting some erratic behavior
+    (kde#393533)
+  * Add options to start Kaffeine on minimal mode and/or with its
+    main window always on top
+  * When a new record starts and there aren't enough resources to
+    keep playing the current DVB channel, switch to the new channel
+    instead of stop playing (kde#393647)
+  * Improve documentation to match the recent changes
+- Drop fix-pt_BR-docs.patch, merged upstream
+
 -------------------------------------------------------------------
 Fri Dec  8 09:55:41 UTC 2017 - wbauer@tmo.at
 
diff --git a/kaffeine.spec b/kaffeine.spec
index 0b588eb..db260e9 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kaffeine
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,14 +20,12 @@ Name:           kaffeine
 Summary:        VLC-based Multimedia Player
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Players
-Version:        2.0.14
+Version:        2.0.15
 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-UPSTREAM fix-pt_BR-docs.patch -- fix build with kdoctools < 5.41, https://websvn.kde.org/?view=revision&revision=1506003
-Patch1:         fix-pt_BR-docs.patch
 Recommends:     %{name}-lang = %version
 Requires:       libQt5Sql5-sqlite
 Requires:       vlc-noX
@@ -70,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