diff --git a/ark-4.9.97-r107635.patch b/ark-4.9.97-r107635.patch deleted file mode 100644 index c958399..0000000 --- a/ark-4.9.97-r107635.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ark-4.9.97/app/mainwindow.cpp.r107635 ark-4.9.97/app/mainwindow.cpp ---- ark-4.9.97/app/mainwindow.cpp.r107635 2012-12-17 09:07:06.000000000 -0600 -+++ ark-4.9.97/app/mainwindow.cpp 2013-01-05 13:17:50.206588420 -0600 -@@ -69,7 +69,6 @@ MainWindow::~MainWindow() - if (m_recentFilesAction) { - m_recentFilesAction->saveEntries(KGlobal::config()->group("Recent Files")); - } -- delete m_part; - m_part = 0; - } - diff --git a/ark.spec b/ark.spec index 06fb8b5..794e1f9 100644 --- a/ark.spec +++ b/ark.spec @@ -5,7 +5,7 @@ Name: ark Summary: Archive manager Version: 4.14.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://utils.kde.org/projects/ark @@ -20,8 +20,6 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar ## upstreamable patches # libkerfuffle namelink_skip Patch50: ark-4.7.80-namelink_skip.patch -# https://git.reviewboard.kde.org/r/107635/ -Patch52: ark-4.9.97-r107635.patch # https://git.reviewboard.kde.org/r/107634/ Patch53: ark-4.9.97-improve_subfolder_autodetection.patch # https://git.reviewboard.kde.org/r/106294/ @@ -86,7 +84,6 @@ Provides: kdeutils-ark-libs = 6:%{version}-%{release} %setup -q -n %{name}-%{version} %patch50 -p1 -b .namelink_skip -%patch52 -p1 -b .r107635 %patch53 -p1 -b .improve_subfolder_autodetection %patch54 -p1 -b .unar-06 @@ -150,6 +147,9 @@ fi %changelog +* Tue Nov 18 2014 Rex Dieter 4.14.3-2 +- omit KXMLGUIClient patch, it was fixed differently upstream (kde#340991) + * Sat Nov 08 2014 Rex Dieter - 4.14.3-1 - 4.14.3