rpms/kdegraphics/F-11 kdegraphics-4.3.2-kde#207461.patch, NONE, 1.1 kdegraphics.spec, 1.207, 1.208

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdegraphics/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27798/F-11

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-4.3.2-kde#207461.patch 
Log Message:
sync w/devel


kdegraphics-4.3.2-kde#207461.patch:
 shell.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE kdegraphics-4.3.2-kde#207461.patch ---
--- branches/KDE/4.3/kdegraphics/okular/shell/shell.cpp	2009/07/06 18:58:27	992398
+++ branches/KDE/4.3/kdegraphics/okular/shell/shell.cpp	2009/10/08 22:20:11	1032945
@@ -58,7 +58,12 @@
      if any.
      */
     QString arg = m_args->arg(argIndex);
+    const QString origArg = arg;
     arg.replace(QRegExp("^file:/{1,3}"), "/");
+    if (arg != origArg)
+    {
+        arg = QString::fromUtf8(QByteArray::fromPercentEncoding(arg.toUtf8()));
+    }
     KUrl url = KCmdLineArgs::makeURL(arg.toUtf8());
     int sharpPos = -1;
     if (!url.isLocalFile() || !QFile::exists(url.toLocalFile()))


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics/F-11/kdegraphics.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -p -r1.207 -r1.208
--- kdegraphics.spec	7 Oct 2009 10:41:26 -0000	1.207
+++ kdegraphics.spec	9 Oct 2009 03:46:01 -0000	1.208
@@ -8,7 +8,7 @@
 Summary:        K Desktop Environment - Graphics Applications
 Epoch:          7
 Version:        4.3.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 
 Name:           kdegraphics
 #Obsoletes:     kdegraphics4 < %{version}-%{release}
@@ -21,12 +21,16 @@ Source0:        ftp://ftp.kde.org/pub/kd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
+# http://bugs.kde.org/207461
+Patch100:  kdegraphics-4.3.2-kde#207461.patch
 
+%if 0%{?fedora}
+BuildRequires:  chmlib-devel
+BuildRequires:  ebook-tools-devel
+%endif
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdepimlibs-devel >= %{version}
-BuildRequires:  chmlib-devel
 BuildRequires:  djvulibre-devel
-BuildRequires:  ebook-tools-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  giflib-devel
 BuildRequires:  lcms-devel
@@ -97,6 +101,8 @@ Summary: A kioslave for displaying WinHe
 %prep
 %setup -q -n kdegraphics-%{version}
 
+%patch100 -p4 -b kde#207461
+
 
 %build
 mkdir -p %{_target_platform}
@@ -231,6 +237,12 @@ fi
 
 
 %changelog
+* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- okular does not handle escaped URL correctly (kde#207461)
+
+* Thu Oct 08 2009 Than Ngo <than at redhat.com> - 4.3.2-2
+- rhel cleanup
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2