From af1fbaa8eb2421e138d042f063f5334a0f19f495 Mon Sep 17 00:00:00 2001
From: Raboneko <119771935+raboneko@users.noreply.github.com>
Date: Thu, 24 Jul 2025 09:48:07 -0700
Subject: [PATCH] fix(vencord-desktop): Rename the package to vesktop inline
 with the name of the upstream project (#5917) (#5918)

* fix(vencord-desktop): Rename the package to vesktop inline with the name of the upstream project

* fix(vencord-desktop): Amend %build to call PNPM directly to fix build failing issue

(cherry picked from commit 6a2a15d53c15ab902c17d8cdb14257d7428baebe)

Co-authored-by: Atmois <info@atmois.com>
---
 anda/apps/vencord-desktop/anda.hcl            |  5 ----
 .../{vencord-desktop => vesktop}/.gitignore   |  0
 anda/apps/vesktop/anda.hcl                    |  5 ++++
 .../{vencord-desktop => vesktop}/update.rhai  |  0
 .../vesktop.spec}                             | 24 +++++++++++--------
 5 files changed, 19 insertions(+), 15 deletions(-)
 delete mode 100644 anda/apps/vencord-desktop/anda.hcl
 rename anda/apps/{vencord-desktop => vesktop}/.gitignore (100%)
 create mode 100644 anda/apps/vesktop/anda.hcl
 rename anda/apps/{vencord-desktop => vesktop}/update.rhai (100%)
 rename anda/apps/{vencord-desktop/vencord-desktop.spec => vesktop/vesktop.spec} (73%)

diff --git a/anda/apps/vencord-desktop/anda.hcl b/anda/apps/vencord-desktop/anda.hcl
deleted file mode 100644
index 3c5a144b6a..0000000000
--- a/anda/apps/vencord-desktop/anda.hcl
+++ /dev/null
@@ -1,5 +0,0 @@
-project "pkg" {
-    rpm {
-        spec = "vencord-desktop.spec"
-    }
-}
\ No newline at end of file
diff --git a/anda/apps/vencord-desktop/.gitignore b/anda/apps/vesktop/.gitignore
similarity index 100%
rename from anda/apps/vencord-desktop/.gitignore
rename to anda/apps/vesktop/.gitignore
diff --git a/anda/apps/vesktop/anda.hcl b/anda/apps/vesktop/anda.hcl
new file mode 100644
index 0000000000..458b87c9bc
--- /dev/null
+++ b/anda/apps/vesktop/anda.hcl
@@ -0,0 +1,5 @@
+project "pkg" {
+    rpm {
+        spec = "vesktop.spec"
+    }
+}
diff --git a/anda/apps/vencord-desktop/update.rhai b/anda/apps/vesktop/update.rhai
similarity index 100%
rename from anda/apps/vencord-desktop/update.rhai
rename to anda/apps/vesktop/update.rhai
diff --git a/anda/apps/vencord-desktop/vencord-desktop.spec b/anda/apps/vesktop/vesktop.spec
similarity index 73%
rename from anda/apps/vencord-desktop/vencord-desktop.spec
rename to anda/apps/vesktop/vesktop.spec
index 8cae730453..cd9b00c004 100644
--- a/anda/apps/vencord-desktop/vencord-desktop.spec
+++ b/anda/apps/vesktop/vesktop.spec
@@ -4,10 +4,11 @@
 %global __requires_exclude libffmpeg.so
 %global __provides_exclude_from %{_datadir}/vesktop/.*\\.so
 
-Name:		vencord-desktop
-Provides:   VencordDesktop = %{version}-%{release}
+Name:		vesktop
+Obsoletes:  VencordDesktop < 1.5.8-1
+Obsoletes:  vencord-desktop < 1.5.8-1
 Version:	1.5.8
-Release:	1%?dist
+Release:	2%?dist
 License:	GPL-3.0
 Summary:	Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
 URL:		https://github.com/Vencord/Vesktop
@@ -35,18 +36,18 @@ Name=Vesktop
 Comment=%summary
 GenericName=Internet Messenger
 Type=Application
-Exec=/usr/bin/vencorddesktop
+Exec=/usr/bin/vesktop
 Icon=vesktop
 Categories=Network;InstantMessaging;
-StartupWMClass=VencordDesktop
+StartupWMClass=vesktop
 
 Keywords=discord;vesktop;vencord;shelter;armcord;electron;
 EOF
 
 
 %build
-npx pnpm@8 install --no-frozen-lockfile
-npx pnpm@8 package:dir
+npx pnpm install --no-frozen-lockfile
+npx pnpm package:dir
 
 
 %install
@@ -54,21 +55,24 @@ npx pnpm@8 package:dir
 mkdir -p %buildroot/usr/share/vesktop
 cp -r dist/*-unpacked/. %buildroot/usr/share/vesktop/.
 
-install -Dm755 dist/*-unpacked/vencorddesktop %buildroot/usr/bin/vencorddesktop
-ln -sf /usr/share/vesktop/vencorddesktop %buildroot/usr/bin/vencorddesktop
+install -Dm755 dist/*-unpacked/vesktop %buildroot/usr/bin/vesktop
+ln -sf /usr/share/vesktop/vesktop %buildroot/usr/bin/vesktop
+ln -sf /usr/bin/vesktop %buildroot/usr/bin/vencorddesktop
 install -Dm644 vesktop.desktop %buildroot/usr/share/applications/vesktop.desktop
 install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/vesktop.png
 
 %files
 %doc README.md
 %license LICENSE
+/usr/bin/vesktop
 /usr/bin/vencorddesktop
 /usr/share/applications/vesktop.desktop
 /usr/share/pixmaps/vesktop.png
 /usr/share/vesktop/*
 
 %changelog
+* Thu Jul 24 2025 Atmois <info@atmois.com> - 1.5.8-2
+- Rename from vencord-desktop to vesktop and amend the spec file accordingly
 * Tue Nov 07 2023 Cappy Ishihara <cappy@cappuchino.xyz> - 0.4.3-1
 - Initial package
 
-