From bb4249248baae493cd9355bf2f16b13570e6602ce08cba11038a9bfceea10803 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 15 Mar 2010 10:30:34 +0000 Subject: [PATCH] Accepting request 34763 from KDE:KDE4:Factory:Desktop Copy from KDE:KDE4:Factory:Desktop/kaffeine based on submit request 34763 from user llunak OBS-URL: https://build.opensuse.org/request/show/34763 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=24 --- kaffeine-1.0-pre2.tar.bz2 | 3 --- kaffeine-1.0-pre3-include_mkfifo.patch | 11 +++++++++++ kaffeine-1.0-pre3.tar.gz | 3 +++ kaffeine-icons.tar.bz2 | 4 ++-- kaffeine.changes | 12 ++++++++++++ kaffeine.spec | 24 ++++++++++++++---------- 6 files changed, 42 insertions(+), 15 deletions(-) delete mode 100644 kaffeine-1.0-pre2.tar.bz2 create mode 100644 kaffeine-1.0-pre3-include_mkfifo.patch create mode 100644 kaffeine-1.0-pre3.tar.gz diff --git a/kaffeine-1.0-pre2.tar.bz2 b/kaffeine-1.0-pre2.tar.bz2 deleted file mode 100644 index 76080d1..0000000 --- a/kaffeine-1.0-pre2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:542b9fe089541a0425a561d18b513dbc85324162fb5d87753e369dc2646bc3f7 -size 224051 diff --git a/kaffeine-1.0-pre3-include_mkfifo.patch b/kaffeine-1.0-pre3-include_mkfifo.patch new file mode 100644 index 0000000..7d291cb --- /dev/null +++ b/kaffeine-1.0-pre3-include_mkfifo.patch @@ -0,0 +1,11 @@ +--- src/mediawidget.cpp 2010-01-31 10:04:50.000000000 -0700 ++++ src/mediawidget.cpp.include_mkfifo 2010-02-16 14:45:57.167779667 -0700 +@@ -40,6 +40,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include diff --git a/kaffeine-1.0-pre3.tar.gz b/kaffeine-1.0-pre3.tar.gz new file mode 100644 index 0000000..2897896 --- /dev/null +++ b/kaffeine-1.0-pre3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b2c4bb08c9f2d85bf430b39c91a4305f34123ca2b42db618bf6aa50cb6361ca +size 337369 diff --git a/kaffeine-icons.tar.bz2 b/kaffeine-icons.tar.bz2 index 440d3b2..d53321a 100644 --- a/kaffeine-icons.tar.bz2 +++ b/kaffeine-icons.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f676da88eb93105a2525e1393f2bf9da801582adef4b2a7dd7f7802ac3c4e21f -size 26324 +oid sha256:df80cb57beec1a96dfaa1aa14c2eb782d4a0a5bc4888b61b4de7c3f315729722 +size 26302 diff --git a/kaffeine.changes b/kaffeine.changes index ffdfeb3..69f81f9 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Mar 11 16:16:44 UTC 2010 - initialZero@gmail.com + +- update to 1.0-pre3: + * new dependencies: Qt SQLite plugin, xine-lib, libX11 + (Phonon is no longer needed) + * added configurable daily or weekly repetition of recording schedule entries + * added support for dynamic audio / subtitles streams + * reworked playlist support + * added DBUS interface and partial MPRIS support + * added dvd menu button and deinterlace option + ------------------------------------------------------------------- Sun Oct 4 13:52:50 UTC 2009 - beineri@opensuse.org diff --git a/kaffeine.spec b/kaffeine.spec index 4e9de10..6ef1021 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -1,7 +1,7 @@ # -# spec file for package kaffeine (Version 0.9+1.0pre2) +# spec file for package kaffeine (Version 0.9+1.0pre3) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products 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,21 +20,21 @@ Name: kaffeine BuildRequires: libkdepimlibs4-devel +BuildRequires: xine-devel Url: http://kaffeine.sourceforge.net/ -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Multimedia/Video/Players Summary: Xine-Based Multimedia Player -Version: 0.9+1.0pre2 -Release: 2 -%define rversion 1.0-pre2 +Version: 0.9+1.0pre3 +Release: 1 +%define rversion 1.0-pre3 # http://kaffeine.kde.org/?q=node/22 -Source0: kaffeine-%rversion.tar.bz2 +Source0: kaffeine-%rversion.tar.gz Source1: kaffeine-icons.tar.bz2 Patch1: fix_plasma_startup_error.diff +Patch2: kaffeine-1.0-pre3-include_mkfifo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires -Provides: kde4-kaffeine = 4.2.2.svn951439 -Obsoletes: kde4-kaffeine <= 4.2.2.svn951439 %description Kaffeine plays all files and devices supported by Xine. For example, @@ -45,11 +45,14 @@ and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards. Authors: -------- - Jürgen Kofler + Jürgen Kofler + Christophe Thommeret + Christoph Pfister %prep %setup -q -n kaffeine-%rversion -b 1 %patch1 +%patch2 %build %cmake_kde4 -d build @@ -74,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT %files -f kaffeine.lang %defattr(-,root,root) /usr/bin/kaffeine +/usr/bin/kaffeine-xbu /usr/%_lib/kde4/kaffeinedvb.so %_kde_share_dir/apps/kaffeine /usr/share/applications/kde4/kaffeine.desktop