From 75c6bf61e1df04248adbb9fd13c1343f7b7a2a1b Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Wed, 3 Feb 2021 13:04:23 -0600
Subject: [PATCH] Add make.

---
 sirikali.spec | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/sirikali.spec b/sirikali.spec
index be7378e..971d5c4 100644
--- a/sirikali.spec
+++ b/sirikali.spec
@@ -35,7 +35,7 @@ Recommends:    fuse-encfs
 
 
 %prep
-%autosetup -p1 -n%{srcname}-%{version}
+%autosetup -p0 -n%{srcname}-%{version}
 # collect licenses
 cp -p src/3rdParty/tasks/LICENSE LICENSE-tasks
 cp -p src/3rdParty/NetworkAccessManager/LICENSE LICENSE-NetworkAccessManager
@@ -47,30 +47,27 @@ sed -i -r 's:".*(json.hpp)":"\1":' CMakeLists.txt
 sed -i 's:3rdParty/json:json:' src/%{name}.cpp
 
 %build
-mkdir %{_target_platform}
+%cmake -DQT5=true -DNOKDESUPPORT=true -DNOSECRETSUPPORT=false \
+ -DINTERNAL_LXQT_WALLET=false \
+ -DJSON_HEADER_PATH=/usr/include/nlohmann/json.hpp ..
 pushd %{_target_platform}
-%cmake .. -DQT5=true \
- -DNOKDESUPPORT=true -DNOSECRETSUPPORT=false \
- -DINTERNAL_LXQT_WALLET=false
+%make_build
 
 %install
-%make_install -C %{_target_platform}
-# ugly, we don't want any prefix to desktop file
-mv %{buildroot}%{_datadir}/applications/*%{name}.desktop\
- %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
-chmod -x %{buildroot}%{_datadir}/applications/*.desktop
+pushd %{_target_platform}
+%make_install
 %find_lang %{name} --with-qt --all-name
 
 %check
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/io.github.mhogomchungu.sirikali.desktop
 
 
-%files -f %{name}.lang
+%files -f %{_target_platform}/%{name}.lang
 %license COPY* LICENSE* GPLv*
 %doc README.md ABOUT* changelog
 %{_bindir}/%{name}*
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/io.github.mhogomchungu.sirikali.desktop
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/translations
 %{_datadir}/icons/hicolor/*/apps/%{name}.png