Accepting request 55773 from KDE:Distro:Factory

Accepted submit request 55773 from user coolo

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

build-fix.diff

@@ -0,0 +1,20 @@
+--- src/dvb/dvbchannelui.h	2010-09-01 21:53:54.000000000 +0200
++++ src/dvb/dvbchannelui.h	2010-09-30 19:30:56.486249907 +0200
+@@ -21,6 +21,7 @@
+ #ifndef DVBCHANNELUI_H
+ #define DVBCHANNELUI_H
+ 
++#include <QSharedDataPointer>
+ #include <QTreeView>
+ 
+ class QAbstractProxyModel;
+--- src/dvb/dvbmanager.h	2010-09-01 21:53:54.000000000 +0200
++++ src/dvb/dvbmanager.h	2010-09-30 20:14:30.720168393 +0200
+@@ -21,6 +21,7 @@
+ #ifndef DVBMANAGER_H
+ #define DVBMANAGER_H
+ 
++#include <QSharedDataPointer>
+ #include <QDate>
+ #include <QMap>
+ #include <QPair>

kaffeine.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec 13 06:01:17 UTC 2010 - coolo@novell.com
+
+- add build fix for old qt versions
+
+-------------------------------------------------------------------
+Mon Dec 13 05:56:38 UTC 2010 - coolo@novell.com
+
+- fix file list for factory
+
 -------------------------------------------------------------------
 Mon Sep 27 23:28:47 UTC 2010 - initialZero@gmail.com
 

kaffeine.spec

@@ -37,6 +37,7 @@ Patch1:         kaffeine-fixsplitter.patch
 Patch2:         fix_plasma_startup_error.diff
 Patch3:         ksuseinstall.diff
 Patch4:         initial-preference.diff
+Patch5:         build-fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %kde4_runtime_requires 
 
@@ -45,14 +46,6 @@ Kaffeine plays all files and devices supported by Xine. For example,
 MPEG files, AVI (if the codec being used is supported by Xine), MP3,
 and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards.
 
-
-
-Authors:
---------
-    Jürgen Kofler        <kaffeine@gmx.net>
-    Christophe Thommeret <hftom@free.fr>   
-    Christoph Pfister    <christophpfister@gmail.com>
-
 %prep
 %setup -q -n kaffeine-%rversion -b 1
 %patch1
@@ -61,6 +54,9 @@ Authors:
 %patch3
 %endif
 %patch4
+%if 0%{?kde_updatedapps}
+%patch5 -p0
+%endif
 
 %build
   %cmake_kde4 -d build
@@ -99,11 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %_datadir/icons/oxygen/*/actions/audio-radio-encrypted.*
 %_datadir/icons/oxygen/*/actions/video-television-encrypted.*
 %_kde_share_dir/apps/profiles/kaffeine.profile.xml
-%if %suse_version < 1130  
 %dir /usr/share/locale/sr@ijekavian
 %dir /usr/share/locale/sr@ijekavian/LC_MESSAGES
 %dir /usr/share/locale/sr@ijekavianlatin
 %dir /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES
-%endif 
 
 %changelog