diff --git a/.cvsignore b/.cvsignore index ff8281d..4294d18 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdegraphics-4.3.2.tar.bz2 +kdegraphics-4.3.3.tar.bz2 diff --git a/kdegraphics-4.3.2-kde#207461.patch b/kdegraphics-4.3.2-kde#207461.patch deleted file mode 100644 index eb1216c..0000000 --- a/kdegraphics-4.3.2-kde#207461.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 0265136..fbc7bc0 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -7,8 +7,8 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 4.3.2 -Release: 3%{?dist} +Version: 4.3.3 +Release: 1%{?dist} Name: kdegraphics #Obsoletes: kdegraphics4 < %{version}-%{release} @@ -21,8 +21,6 @@ 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 @@ -101,8 +99,6 @@ Summary: A kioslave for displaying WinHelp files %prep %setup -q -n kdegraphics-%{version} -%patch100 -p4 -b kde#207461 - %build mkdir -p %{_target_platform} @@ -237,6 +233,9 @@ fi %changelog +* Sat Oct 31 2009 Rex Dieter - 4.3.3-1 +- 4.3.3 + * Thu Oct 08 2009 Rex Dieter - 4.3.2-3 - okular does not handle escaped URL correctly (kde#207461) diff --git a/sources b/sources index 094ab14..68cf291 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a364a8c0f5ab0c0d41088c92890e6adb kdegraphics-4.3.2.tar.bz2 +e150a9538133a359e3e2e8ccf0c58575 kdegraphics-4.3.3.tar.bz2