diff --git a/.cvsignore b/.cvsignore index 6d56a26..2526edb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -7,3 +7,4 @@ hi32-phonon-gstreamer.png hi48-phonon-gstreamer.png hi64-phonon-gstreamer.png phonon-20091118svn.tar.bz2 +phonon-20091124svn.tar.bz2 diff --git a/phonon.spec b/phonon.spec index 70d30d0..1048942 100644 --- a/phonon.spec +++ b/phonon.spec @@ -1,10 +1,10 @@ -%define snap 20091118svn +%define snap 20091124svn Summary: Multimedia framework api Name: phonon Version: 4.3.50 -Release: 2.%{snap}%{?dist} +Release: 3.%{snap}%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ @@ -39,6 +39,11 @@ BuildRequires: libxml2-devel BuildRequires: pkgconfig BuildRequires: qt4-devel BuildRequires: xine-lib-devel +%if 0%{?fedora} > 11 +BuildRequires: pulseaudio-libs-devel >= 0.9.21 +%else +%define pa_keep_old_hacks 1 +%endif Requires: phonon-backend%{?_isa} >= %{version} @@ -79,7 +84,9 @@ Provides: %{name}-backend-gst = %{version}-%{release} %prep %setup -q -n phonon%{!?snap:-%{version}} +%if 0%{?pa_keep_old_hacks} %patch1 -p1 -b .xine_pulseaudio +%endif %build @@ -179,7 +186,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: %changelog -* Wed Nov 18 2009 Rex Dieter - 4.3.50-1.20091118 +* Wed Nov 18 2009 Rex Dieter - 4.3.50-3.20091124 +- phonon-4.3.50 (20091124 snapshot) +- enable pulseaudio integration (F-12+) + +* Wed Nov 18 2009 Rex Dieter - 4.3.50-2.20091118 - phonon-4.3.50 (20091118 snapshot) * Mon Oct 19 2009 Rex Dieter - 4.3.50-1.20091019 diff --git a/sources b/sources index f530c1a..77da72e 100644 --- a/sources +++ b/sources @@ -5,4 +5,4 @@ 12db12c009b722a6dc141f78feb7e330 hi32-phonon-gstreamer.png 86c34a1b81d44980b1381f94ed6b7a23 hi48-phonon-gstreamer.png 153505c71ec021b0a3bd4b74f2492e93 hi64-phonon-gstreamer.png -2710eecb01d27ede4ba5348858b6c0e4 phonon-20091118svn.tar.bz2 +0b522b42d9be2b9297ab972b861fdbb8 phonon-20091124svn.tar.bz2