From 140ee1bb33f5af7d16d16be4ebb74052789221df86548bac13ede5c6cb7f38ce Mon Sep 17 00:00:00 2001
From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date: Mon, 8 Aug 2016 14:33:10 +0000
Subject: [PATCH] Accepting request 417844 from home:wolfi323:test

- Remove workaround to install "Create New" templates as actual files, the issues with using the embedded resource are fixed in 5.25.0

OBS-URL: https://build.opensuse.org/request/show/417844
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=146
---
 kio.changes |  7 +++++++
 kio.spec    | 13 -------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/kio.changes b/kio.changes
index fc1a4ad..bc7fc07 100644
--- a/kio.changes
+++ b/kio.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug  8 11:28:15 UTC 2016 - wbauer@tmo.at
+
+- Remove workaround to install "Create New" templates as actual
+  files, the issues with using the embedded resource are fixed in
+  5.25.0
+
 -------------------------------------------------------------------
 Sun Aug  7 21:54:01 UTC 2016 - hrvoje.senjan@gmail.com
 
diff --git a/kio.spec b/kio.spec
index ff4b8aa..ba83fe6 100644
--- a/kio.spec
+++ b/kio.spec
@@ -141,18 +141,6 @@ echo "%doc %lang(sv) %{_kf5_mandir}/sv" >>%{name}5.lang
 echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
 %endif
 
-# install "Create New" templates to %{_kf5_sharedir}/templates/ as a workaround until kde#963680 is fixed (boo#963680)
-mkdir -p %{buildroot}%{_kf5_sharedir}/templates/.source
-cd src/new_file_templates
-for i in link* Directory.desktop HTMLFile.desktop TextFile.desktop
-do
-cp $i %{buildroot}%{_kf5_sharedir}/templates/
-done
-for i in HTMLFile.html Program.desktop TextFile.txt URL.desktop
-do
-cp $i %{buildroot}%{_kf5_sharedir}/templates/.source/
-done
-
 %post core -p /sbin/ldconfig
 
 %postun core -p /sbin/ldconfig
@@ -250,7 +238,6 @@ done
 %{_kf5_servicesdir}/webshortcuts.desktop
 %{_kf5_sharedir}/dbus-1/services/org.kde.kpasswdserver.service
 %{_kf5_sharedir}/dbus-1/services/org.kde.kcookiejar5.service
-%{_kf5_sharedir}/templates/
 %doc %lang(en) %{_kf5_mandir}/*/kcookiejar5.*
 %dir %{_kf5_htmldir}/en
 %dir %{_kf5_htmldir}