From 281e514086304f0d664236724f9d1da4f00d03ca Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Oct 09 2009 03:46:00 +0000
Subject: sync w/devel


---

diff --git a/kdegraphics-4.3.2-kde#207461.patch b/kdegraphics-4.3.2-kde#207461.patch
new file mode 100644
index 0000000..eb1216c
--- /dev/null
+++ b/kdegraphics-4.3.2-kde#207461.patch
@@ -0,0 +1,15 @@
+--- 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()))
diff --git a/kdegraphics.spec b/kdegraphics.spec
index 93818ba..0265136 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -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/kde/stable/%{version}/src/kdegraphics-%{ve
 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 WinHelp files
 %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@fedoraproject.org> - 4.3.2-3
+- okular does not handle escaped URL correctly (kde#207461)
+
+* Thu Oct 08 2009 Than Ngo <than@redhat.com> - 4.3.2-2
+- rhel cleanup
+
 * Mon Oct 05 2009 Than Ngo <than@redhat.com> - 4.3.2-1
 - 4.3.2