From 8d022c761ada587ecfc4481a70fe951e60980583 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mon, 24 Aug 2015 06:49:46 -0500
Subject: [PATCH] remove temporary patch, adjust whitespace

---
 kio-extras-5.2.2-mtp_catalog.patch | 12 ------------
 kio-extras.spec                    | 17 ++---------------
 2 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 kio-extras-5.2.2-mtp_catalog.patch

diff --git a/kio-extras-5.2.2-mtp_catalog.patch b/kio-extras-5.2.2-mtp_catalog.patch
deleted file mode 100644
index 730a0b5..0000000
--- a/kio-extras-5.2.2-mtp_catalog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up kio-extras-5.2.2/mtp/kio_mtp.cpp.catalog kio-extras-5.2.2/mtp/kio_mtp.cpp
---- kio-extras-5.2.2/mtp/kio_mtp.cpp.catalog	2015-03-19 07:32:48.000000000 -0500
-+++ kio-extras-5.2.2/mtp/kio_mtp.cpp	2015-04-07 07:12:12.867492391 -0500
-@@ -44,7 +44,7 @@ extern "C"
- int Q_DECL_EXPORT kdemain(int argc, char **argv)
- {
-     QCoreApplication app(argc, argv);
--    app.setApplicationName(QLatin1String("kio_mtp"));
-+    app.setApplicationName(QLatin1String("kio_mtp5"));
- 
-     if (argc != 4) {
-         fprintf(stderr, "Usage: kio_mtp protocol domain-socket1 domain-socket2\n");
diff --git a/kio-extras.spec b/kio-extras.spec
index c8197c9..6b2665c 100644
--- a/kio-extras.spec
+++ b/kio-extras.spec
@@ -1,12 +1,11 @@
 Name:           kio-extras
-Version: 15.08.0
-Release: 1%{?dist}
+Version:        15.08.0
+Release:        1%{?dist}
 Summary:        Additional components to increase the functionality of KIO Framework
 
 License:        GPLv2+
 URL:            https://projects.kde.org/projects/kde/workspace/kio-extras
 
-
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
 %global stable unstable
@@ -15,10 +14,6 @@ URL:            https://projects.kde.org/projects/kde/workspace/kio-extras
 %endif
 Source0:        http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
 
-## downstream patches
-# temporarily adjust translation catalog until kio_mtp updates hit stable
-Patch1: kio-extras-5.2.2-mtp_catalog.patch
-
 BuildRequires:  kf5-rpm-macros
 
 BuildRequires:  qt5-qtbase-devel
@@ -75,14 +70,6 @@ BuildArch:      noarch
 %prep
 %setup -q -n %{name}-%{version}
 
-# temporary
-%patch1 -p1 -b .mtp_catalog
-for po in po/*/kio_mtp.po ; do
-pushd $(dirname $po)
-mv kio_mtp.po kio_mtp5.po
-popd
-done
-
 
 %build
 mkdir %{_target_platform}