rpms/phonon/devel phonon.spec, 1.35, 1.36 phonon-4.2.96-pulseaudio.patch, 1.1, NONE phonon-4.3.2-gstreamer-utf8-url.patch, 1.1, NONE phonon-4.3.2-gstreamer-volumefader.patch, 1.1, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1220/devel

Modified Files:
	phonon.spec 
Removed Files:
	phonon-4.2.96-pulseaudio.patch 
	phonon-4.3.2-gstreamer-utf8-url.patch 
	phonon-4.3.2-gstreamer-volumefader.patch 
Log Message:
* Fri Jun 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
- restore patches to the xine backend


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- phonon.spec	5 Jun 2009 23:28:46 -0000	1.35
+++ phonon.spec	5 Jun 2009 23:49:04 -0000	1.36
@@ -1,14 +1,21 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group:   Applications/Multimedia
 License: LGPLv2+
 URL:     http://phonon.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/4.2.1/phonon-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# build only the xine backend
 Patch0: phonon-4.3.1-xineonly.patch
+# bump PulseAudio's priority in the xine backend
+Patch1: phonon-4.2.96-xine-pulseaudio.patch
+
+## Upstream patches
+# fix for non-ascii filenames in xine backend
+Patch100: phonon-4.3.2-kdebug#172242.patch
 
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
@@ -33,6 +40,8 @@ Provides: phonon-backend%{?_isa} = %{ver
 %prep
 %setup -q -n phonon-%{version}%{?alphatag}
 %patch0 -p1 -b .xineonly
+%patch1 -p1 -b .xine-pulseaudio
+%patch102 -p1 -b .xine_nonascii
 
 
 %build
@@ -78,6 +87,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/phonon-xine.*
 
 %changelog
+* Fri Jun 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-8
+- restore patches to the xine backend
+
 * Fri Jun 05 2009 Than Ngo <than at redhat.com> - 4.3.1-7
 - only xine-backend
 


--- phonon-4.2.96-pulseaudio.patch DELETED ---


--- phonon-4.3.2-gstreamer-utf8-url.patch DELETED ---


--- phonon-4.3.2-gstreamer-volumefader.patch DELETED ---