From abbaeda4fd90bd4ad3283d0be258b8bff61d64c4 Mon Sep 17 00:00:00 2001 From: Jozef Mlich Date: Fri, 27 Sep 2024 17:03:27 +0200 Subject: [PATCH] chirp.raw should be in /usr/share/harbour-amazfishd --- daemon/daemon.pro | 2 +- daemon/src/deviceinterface.cpp | 4 ++-- rpm/harbour-amazfish.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/daemon.pro b/daemon/daemon.pro index a817b09e..f6fc35a3 100644 --- a/daemon/daemon.pro +++ b/daemon/daemon.pro @@ -82,7 +82,7 @@ systemd_services.path = $$PREFIX/lib/systemd/user/ systemd_services.files = $$OUT_PWD/harbour-amazfish.service systemd_services.CONFIG += no_check_exist -chirp.path = $$PREFIX/share/harbour-amazfish/ +chirp.path = $$PREFIX/share/harbour-amazfishd/ chirp.files = chirp.raw #Install appropriate files for each system diff --git a/daemon/src/deviceinterface.cpp b/daemon/src/deviceinterface.cpp index 05e4e2df..bad7b5d3 100644 --- a/daemon/src/deviceinterface.cpp +++ b/daemon/src/deviceinterface.cpp @@ -691,9 +691,9 @@ void DeviceInterface::findDevice() #ifdef MER_EDITION_SAILFISH - QFile file("/usr/share/harbour-amazfish/chirp.raw"); + QFile file("/usr/share/harbour-amazfishd/chirp.raw"); #else // elif defined(UUITK_EDITION) - QFile file("/opt/click.ubuntu.com/uk.co.piggz.amazfish/current/share/harbour-amazfish/chirp.raw"); + QFile file("/opt/click.ubuntu.com/uk.co.piggz.amazfish/current/share/harbour-amazfishd/chirp.raw"); #endif if(!file.open(QIODevice::ReadOnly)) diff --git a/rpm/harbour-amazfish.spec b/rpm/harbour-amazfish.spec index 6a5d5217..bbadc16c 100644 --- a/rpm/harbour-amazfish.spec +++ b/rpm/harbour-amazfish.spec @@ -122,6 +122,6 @@ desktop-file-install --delete-original \ %{_datadir}/icons/hicolor/scalable/apps/%{name}-ui.svg %{_userunitdir}/harbour-amazfish.service %{_datadir}/mapplauncherd/privileges.d/harbour-amazfishd.privileges -%{_datadir}/harbour-amazfish/chirp.raw +%{_datadir}/harbour-amazfishd/chirp.raw # >> files # << files