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

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 14 23:50:21 UTC 2015


>From fafab1c658fe29dd43f578a1c2056c5e9162fa6c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Tue, 14 Apr 2015 18:49:32 -0500
Subject: kf5-ize


diff --git a/bovo.spec b/bovo.spec
index 559884f..57299a2 100644
--- a/bovo.spec
+++ b/bovo.spec
@@ -15,11 +15,19 @@ URL:     https://projects.kde.org/projects/kde/kdegames/%{name}
 %endif
 Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
-BuildRequires: desktop-file-utils
+BuildRequires: extra-cmake-modules
+BuildRequires: gettext
+BuildRequires: kf5-rpm-macros
+BuildRequires: kf5-kcoreaddons-devel
+BuildRequires: kf5-kdeclarative-devel
+BuildREquires: kf5-knewstuff-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildREquires: kf5-knewstuff-devel
+BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5Qml) pkgconfig(Qt5Quick) pkgconfig(Qt5QuickWidgets) pkgconfig(Qt5Svg) pkgconfig(Qt5Concurrent)
+BuildRequires: libkdegames-devel >= %{version}
 %if 0%{?fedora} > 19
 BuildRequires: libappstream-glib
 %endif
-BuildRequires: libkdegames-devel >= %{version}
 
 Requires: libkdegames%{?_isa} >= %{version}
 
@@ -37,7 +45,7 @@ horizontally or diagonally.
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kf5} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -46,37 +54,33 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-%find_lang %{name} --with-kde
-
-# fix/move appdata
-mkdir -p %{buildroot}%{_datadir}/appdata
-mv %{buildroot}%{_kde4_appsdir}/appdata/%{name}.appdata.xml %{buildroot}%{_datadir}/appdata/
-
 
 %check
-appstream-util validate-relax --nonet %{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 || :
+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 AUTHORS COPYING*
-%{_kde4_bindir}/%{name}
-%{_kde4_datadir}/applications/kde4/%{name}.desktop
+%{_kf5_bindir}/%{name}
+%{_kf5_datadir}/applications/org.kde.%{name}.desktop
 %{_datadir}/appdata/%{name}.appdata.xml
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_appsdir}/%{name}/
+%{_kf5_datadir}/icons/hicolor/*/*/*
+%{_kf5_datadir}/%{name}/
+%{_kf5_docdir}/HTML/en/%{name}/
+%{_kf5_datadir}/kxmlgui5/%{name}/
 
 
 %changelog
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/bovo.git/commit/?h=master&id=fafab1c658fe29dd43f578a1c2056c5e9162fa6c


More information about the scm-commits mailing list