rpms/phonon/devel phonon-4.3.2-kdebug#172242-2.patch, NONE, 1.1 phonon.spec, 1.41, 1.42

[Rex Dieter]

Author: rdieter

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

Modified Files:
	phonon.spec 
Added Files:
	phonon-4.3.2-kdebug#172242-2.patch 
Log Message:
* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-11
- fix for '#' in filenames


phonon-4.3.2-kdebug#172242-2.patch:

--- NEW FILE phonon-4.3.2-kdebug#172242-2.patch ---
diff -up phonon-4.3.1/xine/mediaobject.cpp.kde#172242-2 phonon-4.3.1/xine/mediaobject.cpp
--- phonon-4.3.1/xine/mediaobject.cpp.kde#172242-2	2009-06-18 12:37:45.641000922 -0500
+++ phonon-4.3.1/xine/mediaobject.cpp	2009-06-18 12:39:15.917231311 -0500
@@ -321,7 +321,7 @@ static QByteArray mrlEncode(QByteArray m
 {
     for (int i = 0; i < mrl.size(); ++i) {
         const unsigned char c = static_cast<unsigned char>(mrl.at(i));
-        if (c & 0x80 || c == '\\' || c < 32 || c == '%') {
+        if (c & 0x80 || c == '\\' || c < 32 || c == '%' || c == '#') {
             char enc[4];
             qsnprintf(enc, 4, "%%%02X", c);
             mrl = mrl.left(i) + QByteArray(enc, 3) + mrl.mid(i + 1);


Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- phonon.spec	9 Jun 2009 10:02:37 -0000	1.41
+++ phonon.spec	18 Jun 2009 17:51:24 -0000	1.42
@@ -4,7 +4,7 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.3.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group:   Applications/Multimedia
 License: LGPLv2+
 URL:     http://phonon.kde.org/
@@ -21,6 +21,8 @@ Patch2: phonon-4.3.1-xine-InitialPrefere
 ## Upstream patches
 # fix for non-ascii filenames in xine backend
 Patch100: phonon-4.3.2-kdebug#172242.patch
+# escape '#' too
+Patch101: phonon-4.3.2-kdebug#172242-2.patch
 
 BuildRequires: automoc4 >= 0.9.86
 BuildRequires: cmake >= 2.6.0
@@ -49,6 +51,7 @@ Requires: phonon%{?_isa} >= %{phonon_ver
 %patch0 -p1 -b .xineonly
 %patch1 -p1 -b .xine-pulseaudio
 %patch100 -p1 -b .xine_nonascii
+%patch101 -p1 -b .xine_nonascii-2
 
 
 %build
@@ -97,6 +100,9 @@ fi
 
 
 %changelog
+* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-11
+- fix for '#' in filenames
+
 * Tue Jun 09 2009 Than Ngo <than at redhat.com> - 4.3.1-10
 - make InitialPreference=9