[bovo] fix FTBFS
Rex Dieter
rdieter at fedoraproject.org
Sat Jan 17 14:51:50 UTC 2015
commit a9f2f4803425f059ef7cb0ae5d4468044dcb23d1
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sat Jan 17 08:51:47 2015 -0600
fix FTBFS
fix appdata, more kde-apps cleanup
bovo.spec | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/bovo.spec b/bovo.spec
index b469aa5..9484bb6 100644
--- a/bovo.spec
+++ b/bovo.spec
@@ -16,9 +16,12 @@ URL: https://projects.kde.org/projects/kde/kdegames/%{name}
Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
BuildRequires: desktop-file-utils
+%if 0%{?fedora} > 19
+BuildRequires: libappstream-glib
+%endif
BuildRequires: libkdegames-devel >= %{version}
-Requires: libkdegames%{?_isa} >= %{_kde4_version}
+Requires: libkdegames%{?_isa} >= %{version}
%description
Bovo is a five-in-a-row game for two players, where the opponents alternate
@@ -32,7 +35,7 @@ horizontally or diagonally.
%build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd
@@ -45,8 +48,13 @@ 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
@@ -66,6 +74,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%doc AUTHORS COPYING*
%{_kde4_bindir}/%{name}
%{_kde4_datadir}/applications/kde4/%{name}.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_appsdir}/%{name}/
More information about the scm-commits
mailing list