rdieter pushed to kanagram (master). "kf5-ize"

[notifications at fedoraproject.org]

>From 83fb75907f4da1dce6e503306f9fb8c44d5b6c18 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 16 Apr 2015 12:29:51 -0500
Subject: kf5-ize


diff --git a/kanagram.spec b/kanagram.spec
index 0500374..5d96e97 100644
--- a/kanagram.spec
+++ b/kanagram.spec
@@ -13,15 +13,35 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
-%if 0%{?fedora} > 19
-BuildRequires: appdata-tools
-%endif
+BuildRequires: cmake
 BuildRequires: desktop-file-utils
-BuildRequires: kdelibs4-devel >= 4.14.4
-BuildRequires: libkdeedu-devel >= 14.12
-
-Requires: kdeedu-data%{?kde4_version: >= %{kde4_version}}
-%{?kde_runtime_requires}
+BuildRequires: extra-cmake-modules
+BuildRequires: gettext
+BuildRequires: kf5-rpm-macros
+BuildRequires: kf5-kcoreaddons-devel
+BuildRequires: kf5-kconfig-devel
+BuildRequires: kf5-kconfigwidgets-devel
+BuildRequires: kf5-kdbusaddons-devel
+BuildRequires: kf5-kdeclarative-devel
+BuildRequires: kf5-kguiaddons-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kitemviews-devel
+BuildRequires: kf5-kio-devel
+BuildRequires: kf5-knewstuff-devel
+BuildRequires: kf5-knotifyconfig-devel
+BuildRequires: kf5-knewstuff-devel
+BuildRequires: kf5-kwindowsystem-devel
+BuildRequires: kf5-kwidgetsaddons-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5Svg)
+## TODO
+#BuildRequires: pkgconfig(Qt5TextToSpeech)
+BuildRequires: libappstream-glib
+BuildRequires: libkdegames-devel >= %{version}
+BuildRequires: libkeduvocdocument-devel >= %{version}
+
+Requires: kdeedu-data
 
 # when split occurred
 Conflicts: kdeedu < 4.7.0-10
@@ -41,7 +61,7 @@ Obsoletes: kanagram-libs < 4.13.90
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -50,39 +70,39 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --with-kde --without-mo
-
-# bug, harmattan icon should not be installed (when harmattan build is off)
-rm -vf %{buildroot}%{_kde4_iconsdir}/hicolor/80x80/apps/kanagram-harmattan.png
+## unpackaged files
+rm -fv %{buildroot}%{_kf5_datadir}/icons/hicolor/*/*/kanagram-harmattan.*
 
 
 %check
-appdata-validate --nonet --relax %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml  ||:
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/%{name}.appdata.xml ||:
+desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop ||:
 
 
 %post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-
-%posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 fi
 
-%files -f %{name}.lang
-%doc ChangeLog COPYING COPYING.DOC TODO
-%{_kde4_bindir}/kanagram
-%{_kde4_appsdir}/kanagram/
-%{_kde4_appsdir}/plasma/packages/org.kde.kanagram
-%{_kde4_datadir}/appdata/kanagram.appdata.xml
-%{_kde4_datadir}/applications/kde4/kanagram.desktop
-%{_kde4_datadir}/config.kcfg/kanagram.kcfg
-%{_kde4_configdir}/kanagram.knsrc
-%{_kde4_iconsdir}/hicolor/*/*/kanagram.*
+%posttrans
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+
+%files
+%doc COPYING*
+%{_kf5_bindir}/%{name}
+%{_sysconfdir}/xdg/%{name}.knsrc
+%{_kf5_datadir}/applications/org.kde.%{name}.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_kf5_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_kf5_datadir}/%{name}/
+%{_kf5_docdir}/HTML/en/%{name}/
+#{_kf5_datadir}/kxmlgui5/%{name}/
+#{_kf5_datadir}/sounds/%{name}/
+%{_kf5_datadir}/config.kcfg/%{name}.kcfg
 
 
 %changelog
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kanagram.git/commit/?h=master&id=83fb75907f4da1dce6e503306f9fb8c44d5b6c18