Accepting request 478941 from KDE:Extra

1

OBS-URL: https://build.opensuse.org/request/show/478941
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=64

fix-building-from-tarball.patch

@@ -0,0 +1,43 @@
+From 2dbc752d644440f963bad172cf3ec83dc681ec7f Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+Date: Tue, 7 Mar 2017 06:54:39 -0300
+Subject: CMakeLists.txt: fix it to allow building from tarball
+
+Kaffeine has a script at tools/update_l10n.sh that allows one to
+download and test all translations locally, with is useful during
+Kaffeine development. Such script creates a file at po/CMakeLists.txt.
+
+However, normal users will use the Kaffeine tarball, downloaded from
+kde.org.
+
+The translations at the po/ directory on the tarballs don't
+have a CMakeLists.txt, as this file is created only if the
+tools/update_l10n.sh is called.
+
+So, change the main CMakeLists.txt to cope with both ways.
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3215e94..d24e848 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -93,7 +93,11 @@ add_subdirectory(icons)
+ add_subdirectory(profiles)
+ add_subdirectory(src)
+ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+-  add_subdirectory(po)
++  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po/CMakeLists.txt" )
++    add_subdirectory(po)
++  else()
++    ki18n_install(po)
++  endif()
+ endif()
+ 
+ if(KF5DocTools_VERSION)
+-- 
+cgit v0.11.2
+

kaffeine-2.0.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:70cd8423a23717edc7c8f127bd41e5e98aa93cc5866615ed25a8da3e148464e6
-size 2295280

kaffeine-2.0.8.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0277e5d3f55e4ac002788fc6954d4ab5c6aa994f63d7c6b9136d3227818facbd
+size 4400524

kaffeine.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Mar  7 11:54:46 UTC 2017 - wbauer@tmo.at
+
+- Update to 2.0.8:
+  * Added Norwegian Nynorsk translation to .desktop files.
+- Update to 2.0.7:
+  * Add support for H-265 video streams.
+  * Organize debug logs per category, using QLoggingCategory.
+- Add fix-building-from-tarball.patch to fix building it from the
+  released 2.0.8 tarball.
+
 -------------------------------------------------------------------
 Wed Feb 22 15:08:04 UTC 2017 - wbauer@tmo.at
 

kaffeine.spec

@@ -20,12 +20,14 @@ Name:           kaffeine
 Summary:        VLC-based Multimedia Player
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Players
-Version:        2.0.6
+Version:        2.0.8
 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-building-from-tarball.patch -- allow kaffeine to be built from the released tarball
+Patch1:         fix-building-from-tarball.patch
 Recommends:     %{name}-lang = %version
 Requires:       libQt5Sql5-sqlite
 Requires:       vlc-noX
@@ -67,6 +69,7 @@ playing their movies: from DVD (including DVD menus, titles, chapters, etc.), VC
 %prep
 %setup -q
 %patch0
+%patch1 -p1
 
 %build
 %cmake_kf5 -d build