packages: kde4-kdemultimedia/kde4-kdemultimedia.spec - merged from DEVEL

[shadzik]

Author: shadzik                      Date: Thu Feb 18 00:10:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdemultimedia:
   kde4-kdemultimedia.spec (1.73 -> 1.74) 

---- Diffs:

================================================================
Index: packages/kde4-kdemultimedia/kde4-kdemultimedia.spec
diff -u packages/kde4-kdemultimedia/kde4-kdemultimedia.spec:1.73 packages/kde4-kdemultimedia/kde4-kdemultimedia.spec:1.74
--- packages/kde4-kdemultimedia/kde4-kdemultimedia.spec:1.73	Thu Jan 28 23:28:06 2010
+++ packages/kde4-kdemultimedia/kde4-kdemultimedia.spec	Thu Feb 18 01:10:11 2010
@@ -1,31 +1,29 @@
 # $Revision$, $Date$
-%define         _state	stable
-%define		orgname	kdemultimedia
-
+%define		_state		stable
+%define		orgname		kdemultimedia
+%define		qtver		4.6.1
 %define		taglib_ver	1.5
 
 Summary:	K Desktop Environment - multimedia applications
 Summary(pl.UTF-8):	K Desktop Environment - aplikacje multimedialne
 Name:		kde4-kdemultimedia
-Version:	4.3.5
+Version:	4.4.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	08611f34d1779f1bf773962b4efa9d81
-#Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-BuildRequires:	Qt3Support-devel
-BuildRequires:	QtSvg-devel
-BuildRequires:	QtTest-devel
+# Source0-md5:	b3c160790ddd06d64d833a8c9a85c164
+BuildRequires:	Qt3Support-devel >= %{qtver}
+BuildRequires:	QtSvg-devel >= %{qtver}
+BuildRequires:	QtTest-devel >= %{qtver}
 BuildRequires:	audiofile-devel
 BuildRequires:	automoc4 >= 0.9.88
 BuildRequires:	cdparanoia-III-devel
-BuildRequires:	cmake >= 2.6.3
+BuildRequires:	cmake >= 2.8.0
 BuildRequires:	flac-devel >= 1.1.2
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	kde4-kdebase-workspace-devel >= %{version}
 BuildRequires:	kde4-kdelibs-devel >= %{version}
-BuildRequires:	kde4-kdelibs-experimental-devel >= %{version}
 BuildRequires:	lame
 BuildRequires:	lame-libs-devel
 BuildRequires:	libcddb-devel
@@ -40,11 +38,11 @@
 BuildRequires:	libtheora-devel
 BuildRequires:	libtunepimp-devel
 BuildRequires:	libvorbis-devel
-BuildRequires:	phonon-devel >= 4.3.1
+BuildRequires:	phonon-devel >= 4.3.80
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel
-BuildRequires:	qt4-build
-BuildRequires:	qt4-qmake
+BuildRequires:	qt4-build >= %{qtver}
+BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	speex-devel
 BuildRequires:	taglib-devel >= %{taglib_ver}
@@ -274,6 +272,7 @@
 %{_datadir}/apps/kconf_update/audiocd.upd
 %{_datadir}/kde4/services/audiocd.protocol
 %{_datadir}/kde4/services/audiocd.desktop
+%{_datadir}/apps/solid/actions/solid_audiocd.desktop
 %lang(en) %{_kdedocdir}/en/kioslave/audiocd
 
 %files cddb
@@ -352,21 +351,54 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.73  2010/01/28 22:28:06  shadzik
-- 4.3.5
-- kill useless kde4-kdebase-devel BR
+Revision 1.74  2010/02/18 00:10:11  shadzik
+- merged from DEVEL
+
+Revision 1.68.2.15  2010/02/04 20:40:59  arekm
+- up to 4.4.0
+
+Revision 1.68.2.14  2010/02/02 20:55:32  shadzik
+- bump up qtver; it's not necessary but we make sure we link with the latest qtver
+
+Revision 1.68.2.13  2010/02/02 15:48:51  shadzik
+- version qt4 BRs
+
+Revision 1.68.2.12  2010/02/02 13:11:38  shadzik
+- force cmake 2.8.0 BR
+
+Revision 1.68.2.11  2010/02/01 01:06:50  shadzik
+- 4.4 RC3
+
+Revision 1.68.2.10  2010/01/28 23:11:14  shadzik
+- kill useless BRs
+
+Revision 1.68.2.9  2010/01/20 09:34:48  arekm
+- up to 4.3.95
+
+Revision 1.68.2.8  2010/01/08 11:52:34  arekm
+- up to 4.3.90
+
+Revision 1.68.2.7  2009/12/20 16:47:21  shadzik
+- 4.4 Beta2
+
+Revision 1.68.2.6  2009/12/03 22:02:53  sparky
+- BR: Qt3Support-devel, QtSvg-devel, QtTest-devel, pulseaudio-devel,
+  qt4-build, qt4-qmake
+
+Revision 1.68.2.5  2009/12/03 20:42:26  shadzik
+- updated BRs
 
-Revision 1.72  2009/12/03 22:00:26  sparky
-- BR: pulseaudio-devel
+Revision 1.68.2.4  2009/12/03 16:14:19  shadzik
+- 4.4 beta1
 
-Revision 1.71  2009/12/02 17:17:40  sparky
-- BR: Qt3Support-devel, QtSvg-devel, QtTest-devel, qt4-build, qt4-qmake
+Revision 1.68.2.3  2009/11/18 17:40:21  cactus
+- up to 4.3.75
 
-Revision 1.70  2009/11/28 18:19:44  shadzik
-- 4.3.4
+Revision 1.68.2.2  2009/10/29 14:10:20  paszczus
+- updated to 4.3.73
 
-Revision 1.69  2009/10/31 14:08:11  shadzik
-- 4.3.3
+Revision 1.68.2.1  2009/10/18 18:16:32  paszczus
+- updated to 4.3.72
 
 Revision 1.68  2009/10/03 11:20:35  shadzik
 - 4.3.2 try #1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdemultimedia/kde4-kdemultimedia.spec?r1=1.73&r2=1.74&f=u