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

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 16 21:28:09 UTC 2015


>From 9fc601a66ac4f3e4b19b5f75e2240afa85014cc8 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 16 Apr 2015 16:28:00 -0500
Subject: kf5-ize


diff --git a/kblocks.spec b/kblocks.spec
index c0e7131..7ece0fc 100644
--- a/kblocks.spec
+++ b/kblocks.spec
@@ -14,11 +14,34 @@ URL:     https://projects.kde.org/projects/kde/kdegames/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
+BuildRequires: cmake
 BuildRequires: desktop-file-utils
+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-kguiaddons-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kiconthemes-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(Qt5Widgets) pkgconfig(Qt5Qml) pkgconfig(Qt5Quick) pkgconfig(Qt5QuickWidgets) pkgconfig(Qt5Svg) pkgconfig(Qt5Test)
+BuildRequires: libappstream-glib
 BuildRequires: libkdegames-devel >= %{version}
 
-Requires: libkdegames%{?_isa} >= %{version}
-
 %description
 KBlocks is the classic falling blocks game. The idea is stack
 the falling blocks in a way that lines are completely filled.
@@ -32,9 +55,9 @@ the game is over.
 
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -43,33 +66,38 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --with-kde
-
 
 %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 || :
+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
 
 %posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || :
 
-%files -f %{name}.lang
+%files
 %doc COPYING*
-%{_kde4_bindir}/%{name}
-%{_kde4_datadir}/applications/kde4/%{name}.desktop
-%{_kde4_configdir}/%{name}.knsrc
-%{_kde4_configdir}.kcfg/%{name}.kcfg
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_appsdir}/%{name}/
+#doc README
+%{_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}/kconf_update/%{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/kblocks.git/commit/?h=master&id=9fc601a66ac4f3e4b19b5f75e2240afa85014cc8


More information about the scm-commits mailing list