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

[notifications at fedoraproject.org]

>From 6c3bdf0eec9d92792f92da2244176e66ab470211 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 17 Apr 2015 18:11:02 -0500
Subject: kf5-ize


diff --git a/khangman.spec b/khangman.spec
index d3d8211..b042f7f 100644
--- a/khangman.spec
+++ b/khangman.spec
@@ -13,37 +13,51 @@ URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
+BuildRequires: cmake
 BuildRequires: desktop-file-utils
-BuildRequires: kdelibs4-devel >= 4.14.4
-BuildRequires: libkdeedu-devel >= 14.12
+BuildRequires: extra-cmake-modules
+BuildRequires: gettext
+BuildRequires: kf5-rpm-macros
+BuildRequires: kf5-kcompletion-devel
+BuildRequires: kf5-kconfig-devel
+BuildRequires: kf5-kconfigwidgets-devel
+BuildRequires: kf5-kcoreaddons-devel
+BuildRequires: kf5-kdbusaddons-devel
+BuildRequires: kf5-kdeclarative-devel
+BuildRequires: kf5-kdelibs4support-devel
+BuildRequires: kf5-kdnssd-devel
+BuildRequires: kf5-kguiaddons-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kitemmodels-devel
+BuildRequires: kf5-kitemviews-devel
+BuildRequires: kf5-kio-devel
+BuildRequires: kf5-kjobwidgets-devel
+BuildRequires: kf5-knewstuff-devel
+BuildRequires: kf5-knotifyconfig-devel
+BuildRequires: kf5-knewstuff-devel
+BuildRequires: kf5-kservice-devel
+BuildRequires: kf5-kwindowsystem-devel
+BuildRequires: kf5-kwidgetsaddons-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: pkgconfig(Qt5Core) pkgconfig(Qt5Qml) pkgconfig(Qt5Quick) pkgconfig(Qt5QuickWidgets) pkgconfig(Qt5Svg)
+BuildRequires: libappstream-glib
+BuildRequires: libkeduvocdocument-devel >= %{version}
 
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: dustin-dustismo-roman-fonts
 Requires: dustin-domestic-manners-fonts
-Requires: kdeedu-data%{?kde4_version: >= %{kde4_version}}
-%{?kde_runtime_requires}
+Requires: kdeedu-data
 
 # when split occurred
 Conflicts: kdeedu < 4.7.0-10
 
+Obsoletes: khangman-libs < 15.04
+Obsoletes: khangman-devel < 15.04
 
 %description
 %{summary}.
 
 
-%package devel
-Summary:  Developement files for %{name}
-Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-%description devel
-%{summary}.
-
-%package libs
-Summary:  Runtime libraries for %{name}
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
-
-
 %prep
 %setup -q
 
@@ -51,7 +65,7 @@ Requires: %{name} = %{version}-%{release}
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -60,55 +74,49 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --with-kde --without-mo
-
 ## unpackaged files
 # omit bundled dustismo roman font
-rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Dustismo_Roman.ttf
+rm -fv %{buildroot}%{_kf5_datadir}/khangman/fonts/Dustismo_Roman.ttf
 # omit bundled domestic manners font
-rm -f %{buildroot}%{_kde4_appsdir}/khangman/fonts/Domestic_Manners.ttf
+rm -fv %{buildroot}%{_kf5_datadir}/khangman/fonts/Domestic_Manners.ttf
 
 # bug, harmattan icon should not be installed (when harmattan build is off)
-rm -vf %{buildroot}%{_kde4_iconsdir}/hicolor/80x80/apps/khangman-harmattan.png
-rm -vf %{buildroot}%{_kde4_iconsdir}/hicolor/scalable/apps/khangman-harmattan.svgz
+rm -vf %{buildroot}%{_kf5_datadir}/icons/hicolor/*/apps/khangman-harmattan.*
 
 
 %check
-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 AUTHORS ChangeLog COPYING README TODO
-%{_kde4_bindir}/khangman
-%{_kde4_appsdir}/khangman/
-%{_kde4_datadir}/appdata/khangman.appdata.xml
-%{_kde4_datadir}/applications/kde4/khangman.desktop
-%{_kde4_datadir}/config.kcfg/khangman.kcfg
-%{_kde4_configdir}/khangman.knsrc
-%{_kde4_iconsdir}/hicolor/*/*/khangman.*
-%{_mandir}/man6/khangman.*
-
-%files devel
-%{_includedir}/khangman/
-%{_kde4_libdir}/libkhangmanengine.so
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%files libs
-%{_kde4_libdir}/libkhangmanengine.so.*
+%posttrans
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
+
+%files
+%doc COPYING*
+%doc README
+%{_kf5_bindir}/%{name}*
+%{_sysconfdir}/xdg/%{name}.knsrc
+%{_kf5_datadir}/applications/org.kde.%{name}.desktop
+%{_kf5_datadir}/appdata/%{name}.appdata.xml
+%{_kf5_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_kf5_datadir}/%{name}/
+%{_kf5_docdir}/HTML/en/%{name}/
+#{_kf5_datadir}/kconf_update/%{name}*
+#{_kf5_datadir}/knotifications5/%{name}.notifyrc
+#{_kf5_datadir}/kxmlgui5/%{name}/
+#{_kf5_datadir}/sounds/%{name}*
+%{_kf5_datadir}/config.kcfg/%{name}.kcfg
+%{_mandir}/man6/%{name}.6*
 
 
 %changelog
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/khangman.git/commit/?h=master&id=6c3bdf0eec9d92792f92da2244176e66ab470211