diff --git a/.gitignore b/.gitignore index ae5c25b..b6f516f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /hi64-phonon-gstreamer.png /phonon-4.4.3.tar.bz2 /phonon-4.4.4.tar.bz2 +/phonon-4.5.0.tar.bz2 diff --git a/phonon-4.3.50-phonon-allow-stop-empty-source.patch b/phonon-4.3.50-phonon-allow-stop-empty-source.patch deleted file mode 100644 index 9ddf7d2..0000000 --- a/phonon-4.3.50-phonon-allow-stop-empty-source.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur phonon-4.3.50.orig/phonon/mediaobject.cpp phonon-4.3.50/phonon/mediaobject.cpp ---- phonon-4.3.50.orig/phonon/mediaobject.cpp 2009-02-26 22:33:54.000000000 +0100 -+++ phonon-4.3.50/phonon/mediaobject.cpp 2009-10-12 22:48:22.000000000 +0200 -@@ -114,7 +114,7 @@ - void MediaObject::stop() - { - K_D(MediaObject); -- if (d->backendObject() && isPlayable(d->mediaSource.type())) { -+ if (d->backendObject() && d->mediaSource.type() != MediaSource::Invalid) { - INTERFACE_CALL(stop()); - } - } - diff --git a/phonon.spec b/phonon.spec index a589bf0..c4350aa 100644 --- a/phonon.spec +++ b/phonon.spec @@ -1,15 +1,15 @@ -#define snap 20110104 -# not worth using much yet -#define phonon_build_tests -DPHONON_BUILD_TESTS:BOOL=ON +# enabling for the build sanity, the results +# aren't all that useful, yet. +%define phonon_build_tests -DPHONON_BUILD_TESTS:BOOL=ON ## split -experimental subpkgs #define experimental 1 Summary: Multimedia framework api Name: phonon -Version: 4.4.4 -Release: 3%{?dist} +Version: 4.5.0 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ @@ -18,14 +18,16 @@ Source0: phonon-%{version}-%{snap}.tar.bz2 %else Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/src/phonon-%{version}.tar.bz2 %endif -Source1: phonon_snapshot.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: phonon-4.4.4-no_rpath.patch +# (may?) need to be careful here, bootstrapping this with qt +# added Obsoletes into qt-4.7.2-6 instead of here -- Rex +#Obsoletes: qt-designer-plugin-phonon < 1:4.7.2-100 +Conflicts: qt-designer-plugin-phonon < 1:4.7.2-6 +Provides: qt-designer-plugin-phonon = 1:4.7.2-100 +Provides: qt-designer-plugin-phonon%{?_isa} = 1:4.7.2-100 -## Mandriva/upstreamable patches -# https://qa.mandriva.com/show_bug.cgi?id=49814#c40 -Patch53: phonon-4.3.50-phonon-allow-stop-empty-source.patch +Patch1: phonon-4.4.4-no_rpath.patch ## Ubuntu/upstreamable patches @@ -94,7 +96,6 @@ Includes experimental and unstable apis. %setup -q %patch1 -p1 -b .no_rpath -%patch53 -p1 -b .phonon-allow-stop-empty-source %build @@ -125,7 +126,7 @@ mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/phononbackends/ export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig test "$(pkg-config --modversion phonon)" = "%{version}" %if 0%{?phonon_build_tests:1} -# most of these fail currently (8/10) +# many of these fail currently (4/10) make test -C %{_target_platform} ||: %endif @@ -150,6 +151,7 @@ rm -rf %{buildroot} %doc COPYING.LIB %{_libdir}/libphonon.so.4* %{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml +%{_qt4_plugindir}/designer/libphononwidgets.so %dir %{_kde4_libdir}/kde4/plugins/phonon_backend/ %dir %{_kde4_datadir}/kde4/services/phononbackends/ @@ -181,6 +183,10 @@ rm -rf %{buildroot} %changelog +* Fri Mar 25 2011 Rex Dieter 4.5.0-1 +- phonon-4.5.0 +- qt-designer-plugin-phonon moved here (from qt) + * Wed Feb 09 2011 Fedora Release Engineering - 4.4.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/phonon_snapshot.sh b/phonon_snapshot.sh deleted file mode 100755 index 75ace53..0000000 --- a/phonon_snapshot.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -MODULE=phonon -VERSION=4.4.4 -DATE=$(date +%Y%m%d) - -set -x - -rm -rf $MODULE - -git clone git://anongit.kde.org/phonon $MODULE/ -pushd $MODULE -git archive remotes/origin/4.4 --format tar --prefix=${MODULE}-${VERSION}/ | bzip2 -9 > ../${MODULE}-${VERSION}-${DATE}.tar.bz2 -popd - -rm -rf $MODULE diff --git a/sources b/sources index 58c2231..d187ae4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1deb14ecb2185e1f2fe2741a0bd46852 phonon-4.4.4.tar.bz2 +32f8d388c18fde2e23dea7bb103f9713 phonon-4.5.0.tar.bz2