From 12b2bc15c38ec4f09afee202d3073e9f4313598a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sun, 4 Jun 2017 16:04:07 -0500
Subject: [PATCH] 17.04.1, move -docs content to main pkg

---
 .gitignore      | 14 +-------------
 kio-extras.spec | 38 +++++++++++++++++++++-----------------
 sources         |  2 +-
 3 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index b73c93c..cef04bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1 @@
-/kio-extras-16.04.0.tar.xz
-/kio-extras-16.04.1.tar.xz
-/kio-extras-16.04.2.tar.xz
-/kio-extras-16.04.3.tar.xz
-/kio-extras-16.07.80.tar.xz
-/kio-extras-16.07.90.tar.xz
-/kio-extras-16.08.0.tar.xz
-/kio-extras-16.08.1.tar.xz
-/kio-extras-16.08.2.tar.xz
-/kio-extras-16.08.3.tar.xz
-/kio-extras-16.12.1.tar.xz
-/kio-extras-16.12.2.tar.xz
-/kio-extras-16.12.3.tar.xz
+/kio-extras-17.04.1.tar.xz
diff --git a/kio-extras.spec b/kio-extras.spec
index 119f7ca..913e097 100644
--- a/kio-extras.spec
+++ b/kio-extras.spec
@@ -7,12 +7,12 @@
 %endif
 
 Name:    kio-extras
-Version: 16.12.3
-Release: 2%{?dist}
+Version: 17.04.1
+Release: 1%{?dist}
 Summary: Additional components to increase the functionality of KIO Framework
 
 License: GPLv2+
-URL:     https://quickgit.kde.org/?p=%{name}.git
+URL:     https://cgit.kde.org/%{name}.git
 
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -55,6 +55,7 @@ BuildRequires:  perl-generators
 BuildRequires:  phonon-qt5-devel
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtsvg-devel
+BuildRequires:  taglib-devel > 1.11
 %if 0%{?fedora} > 24
 # work around possibly missing macro
 %{!?qt5_qtwebengine_arches:%global qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el}
@@ -69,25 +70,25 @@ BuildRequires: time
 BuildRequires: xorg-x11-server-Xvfb
 %endif
 
+# translations moved here
+Conflicts: kde-l10n < 17.03
+
 # short-lived subpkg, locale conflicts fixed in kio_mtp instead
 Obsoletes:      kio-extras-mtp-common < 5.2.2-3
 
+Obsoletes: kde-runtime-docs < 5.0.0-1
+# when went noarch
+Obsoletes: kio-extras-doc < 5.8.0-2
+# moved to main pkg
+Obsoletes: kio-extras-docs < 17.03
+Provides:  kio-extras-docs = %{version}-%{release}
+
 # helpful for  imagethumbnail plugin
 Recommends:     qt5-qtimageformats %{?_isa}
 
 %description
 %{summary}.
 
-%package        docs
-Summary:        Documentation and user manuals for %{name}
-Obsoletes:      kde-runtime-docs < 5.0.0-1
-# when went noarch
-Obsoletes:      kio-extras-doc < 5.8.0-2
-Requires:       %{name} = %{version}-%{release}
-BuildArch:      noarch
-%description    docs
-%{summary}.
-
 %if 0%{?htmlthumbnail}
 %package        htmlthumbnail
 Summary:        KIO HTML thumbnailer
@@ -115,6 +116,8 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%find_lang %{name} --all-name --with-html
+
 
 %check
 %if 0%{?tests}
@@ -138,7 +141,7 @@ fi
 %posttrans
 update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
-%files
+%files -f %{name}.lang
 # include *a* copy, others are in mtp/
 %license fish/COPYING
 %{_libdir}/libmolletnetwork5.so.*
@@ -162,6 +165,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_kf5_plugindir}/kio/sftp.so
 %{_kf5_plugindir}/kio/smb.so
 %{_kf5_plugindir}/kio/thumbnail.so
+%{_kf5_qtplugindir}/audiothumbnail.so
 %{_kf5_qtplugindir}/comicbookthumbnail.so
 %{_kf5_qtplugindir}/djvuthumbnail.so
 %{_kf5_qtplugindir}/exrthumbnail.so
@@ -198,9 +202,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/mime/packages/kf5_network.xml
 %{_datadir}/config.kcfg/jpegcreatorsettings5.kcfg
 
-%files docs
-%{_docdir}/HTML/en/kioslave5/
-
 %if 0%{?htmlthumbnail}
 %files htmlthumbnail
 %{_kf5_qtplugindir}/htmlthumbnail.so
@@ -208,6 +209,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Sun Jun 04 2017 Rex Dieter <rdieter@fedoraproject.org> - 17.04.1-1
+- 17.04.1, move -docs content to main pkg
+
 * Tue May 02 2017 Rex Dieter <rdieter@fedoraproject.org> - 16.12.3-2
 - rebuild (exiv2)
 
diff --git a/sources b/sources
index 049f9f3..93c8556 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kio-extras-16.12.3.tar.xz) = 1b0f0f025deab5f14479e47c29ff18974de461a605055a8c684a588526ef8fff9903ce853e56613db4346f426929e37f4409450221503ce3bce2d812f8f1f4fe
+SHA512 (kio-extras-17.04.1.tar.xz) = 15c8d27d9a7fbfe684d766cfb8aecb14ef9d6382e7d5da39423f5fbb34bcfc0c7e88cbf28ff278b9aa841a178ae898a6d825d948396fcf88cfe322b998d5541d