From 28066a6dc2f445d9e143e234641d066d82c27250 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Fri, 14 Apr 2017 11:48:33 -0500
Subject: [PATCH] 17.04.0, +translations, cmake-style kf5 deps

---
 .gitignore   |  4 +--
 dolphin.spec | 70 +++++++++++++++++++++++++++++++++-------------------
 sources      |  2 +-
 3 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6c5f0ea..e8d36c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/dolphin-16.12.1.tar.xz
-/dolphin-16.12.2.tar.xz
-/dolphin-16.12.3.tar.xz
+/dolphin-17.04.0.tar.xz
diff --git a/dolphin.spec b/dolphin.spec
index a746193..e0a18cd 100644
--- a/dolphin.spec
+++ b/dolphin.spec
@@ -8,7 +8,7 @@
 
 Name:    dolphin
 Summary: KDE File Manager
-Version: 16.12.3
+Version: 17.04.0
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -23,27 +23,29 @@ URL:     https://cgit.kde.org/%{name}.git/
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  extra-cmake-modules
 BuildRequires:  qt5-qtbase-devel
+
+BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-rpm-macros
-BuildRequires:  kf5-kdelibs4support-devel
-BuildRequires:  kf5-kdoctools-devel
-BuildRequires:  kf5-kinit-devel
-BuildRequires:  kf5-kcmutils-devel
-BuildRequires:  kf5-knewstuff-devel
-BuildRequires:  kf5-kcoreaddons-devel
-BuildRequires:  kf5-ki18n-devel
-BuildRequires:  kf5-kdbusaddons-devel
-BuildRequires:  kf5-kbookmarks-devel
-BuildRequires:  kf5-kconfig-devel
-BuildRequires:  kf5-kio-devel
-BuildRequires:  kf5-kparts-devel
-BuildRequires:  kf5-solid-devel
-BuildRequires:  kf5-kiconthemes-devel
-BuildRequires:  kf5-kcompletion-devel
-BuildRequires:  kf5-ktexteditor-devel
-BuildRequires:  kf5-kwindowsystem-devel
-BuildRequires:  kf5-knotifications-devel
+BuildRequires:  cmake(KF5DocTools)
+BuildRequires:  cmake(KF5Init)
+BuildRequires:  cmake(KF5KCMUtils)
+BuildRequires:  cmake(KF5NewStuff)
+BuildRequires:  cmake(KF5CoreAddons)
+BuildRequires:  cmake(KF5I18n)
+BuildRequires:  cmake(KF5DBusAddons)
+BuildRequires:  cmake(KF5Bookmarks)
+BuildRequires:  cmake(KF5Config)
+BuildRequires:  cmake(KF5KIO)
+BuildRequires:  cmake(KF5Parts)
+BuildRequires:  cmake(KF5Solid)
+BuildRequires:  cmake(KF5IconThemes)
+BuildRequires:  cmake(KF5Completion)
+BuildRequires:  cmake(KF5TextWidgets)
+BuildRequires:  cmake(KF5Notifications)
+BuildRequires:  cmake(KF5Crash)
+
+BuildRequires:  phonon-qt5-devel
 
 %if ! 0%{?bootstrap}
 BuildRequires:  kf5-kactivities-devel
@@ -52,20 +54,26 @@ BuildRequires:  kf5-kfilemetadata-devel
 BuildRequires:  baloo-widgets-devel >= %{majmin_ver}
 %endif
 
-BuildRequires:  phonon-qt5-devel
-
+%if 0%{?tests}
+BuildRequires: xorg-x11-server-Xvfb
+# for %%check
 BuildRequires:  libappstream-glib
+%endif
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 %{?kf5_kinit_requires}
 
 Recommends:     kio-extras%{?_isa}
 
+# translations moved here
+Conflicts: kde-l10n < 17.03
+
 %description
 %{summary}.
 
 %package        libs
 Summary:        Dolphin runtime libraries
+Requires:       %{name} = %{version}-%{release}
 %description    libs
 %{summary}.
 
@@ -95,19 +103,19 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%find_lang dolphin
+
 
 %check
 appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/org.kde.%{name}.appdata.xml ||:
 desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop ||:
 %if 0%{?tests}
 export CTEST_OUTPUT_ON_FAILURE=1
-#dbus-launch --exit-with-session \
 xvfb-run -a \
 make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||:
 %endif
 
 
-
 %posttrans
 update-desktop-database -q &> /dev/null ||:
 
@@ -116,7 +124,7 @@ if [ $1 -eq 0 ] ; then
 update-desktop-database -q &> /dev/null ||:
 fi
 
-%files
+%files -f dolphin.lang
 %license COPYING*
 %doc README
 %{_kf5_bindir}/%{name}
@@ -131,7 +139,16 @@ fi
 %{_kf5_datadir}/applications/org.kde.%{name}.desktop
 %{_kf5_datadir}/kservicetypes5/fileviewversioncontrolplugin.desktop
 %{_kf5_datadir}/kxmlgui5/%{name}/
+%lang(ca) %{_kf5_docdir}/HTML/ca/%{name}/
+%lang(de) %{_kf5_docdir}/HTML/de/%{name}/
 %lang(en) %{_kf5_docdir}/HTML/en/%{name}/
+%lang(es) %{_kf5_docdir}/HTML/es/%{name}/
+%lang(it) %{_kf5_docdir}/HTML/it/%{name}/
+%lang(nl) %{_kf5_docdir}/HTML/nl/%{name}/
+%lang(pt_BR) %{_kf5_docdir}/HTML/pt_BR/%{name}/
+%lang(sr) %{_kf5_docdir}/HTML/sr/%{name}/
+%lang(sv) %{_kf5_docdir}/HTML/sv/%{name}/
+%lang(uk) %{_kf5_docdir}/HTML/uk/%{name}/
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -153,6 +170,9 @@ fi
 
 
 %changelog
+* Fri Apr 14 2017 Rex Dieter <rdieter@fedoraproject.org> - 17.04.0-1
+- 17.04.0, +translations, cmake-style kf5 deps
+
 * Wed Mar 08 2017 Rex Dieter <rdieter@fedoraproject.org> - 16.12.3-1
 - 16.12.3
 
diff --git a/sources b/sources
index 95c26b1..07e8cd0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dolphin-16.12.3.tar.xz) = 99a6f35678918dffa7a55b453705186a92bf1b69776a7b80ef12553489e258f5776a5d7b2a5dd16cbdb2e6772a2a122fe10e74afb6233e7a939f8f925e1d8736
+SHA512 (dolphin-17.04.0.tar.xz) = dc5fbd343e5f8f43694d6c024f72c00a9fe3274f9b718c2c9d11b8ee36001a85162e109c3c71cc5c1b4dbf8746fdd4076f32f6732ebfc546d4c862568e4f6435