From ef8dbe2999a1379b9ef073fecddfb83201455860 Mon Sep 17 00:00:00 2001
From: ZavaruKitsu <alexeyzavar@gmail.com>
Date: Tue, 1 Aug 2023 10:05:44 +0000
Subject: [PATCH] fix: merge changes
---
Telegram/CMakeLists.txt | 2 +-
lib/xdg/org.ayugram.desktop.service | 2 +-
lib/xdg/org.telegram.desktop.service | 0
3 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 lib/xdg/org.telegram.desktop.service
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 385b58a41..898416cbb 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1802,7 +1802,7 @@ endif()
if (LINUX AND DESKTOP_APP_USE_PACKAGED)
include(GNUInstallDirs)
- configure_file("../lib/xdg/org.telegram.desktop.service" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.service" @ONLY)
+ configure_file("../lib/xdg/org.ayugram.desktop.service" "${CMAKE_CURRENT_BINARY_DIR}/org.ayugram.desktop.service" @ONLY)
configure_file("../lib/xdg/org.ayugram.desktop.metainfo.xml" "${CMAKE_CURRENT_BINARY_DIR}/org.ayugram.desktop.metainfo.xml" @ONLY)
generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/org.ayugram.desktop.metainfo.xml")
install(TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/lib/xdg/org.ayugram.desktop.service b/lib/xdg/org.ayugram.desktop.service
index dc0531477..0d5bfb66d 100644
--- a/lib/xdg/org.ayugram.desktop.service
+++ b/lib/xdg/org.ayugram.desktop.service
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.ayugram.desktop
-Exec=ayugram-desktop
+Exec=@CMAKE_INSTALL_FULL_BINDIR@/ayugram-desktop
diff --git a/lib/xdg/org.telegram.desktop.service b/lib/xdg/org.telegram.desktop.service
deleted file mode 100644
index e69de29bb..000000000