From 4377d7562089b7725957e371671e86130322ff54 Mon Sep 17 00:00:00 2001
From: Lucas <46837214+foopsss@users.noreply.github.com>
Date: Wed, 29 Nov 2023 03:42:12 -0300
Subject: [PATCH] Rename the onedriver desktop entry to fix the window icon in
 the GNOME workspace switcher (#369)

* Rename the "onedriver.desktop" file to "onedriver-launcher.desktop"

* Update onedriver.spec

Oops, I didn't realize beforehand that I only had to add "-launcher" at the end of the .desktop file name instead of replacing the macros.
---
 Makefile                                                      | 4 ++--
 onedriver.spec                                                | 4 ++--
 pkg/debian/rules                                              | 2 +-
 .../{onedriver.desktop => onedriver-launcher.desktop}         | 0
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename pkg/resources/{onedriver.desktop => onedriver-launcher.desktop} (100%)

diff --git a/Makefile b/Makefile
index 95179de3..e444eab0 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ install: onedriver onedriver-launcher
 	cp pkg/resources/onedriver.svg /usr/share/icons/onedriver/
 	cp pkg/resources/onedriver.png /usr/share/icons/onedriver/
 	cp pkg/resources/onedriver-128.png /usr/share/icons/onedriver/
-	cp pkg/resources/onedriver.desktop /usr/share/applications/
+	cp pkg/resources/onedriver-launcher.desktop /usr/share/applications/
 	cp pkg/resources/onedriver@.service /etc/systemd/user/
 	gzip -c pkg/resources/onedriver.1 > /usr/share/man/man1/onedriver.1.gz
 	mandb
@@ -54,7 +54,7 @@ uninstall:
 		/usr/bin/onedriver \
 		/usr/bin/onedriver-launcher \
 		/etc/systemd/user/onedriver@.service \
-		/usr/share/applications/onedriver.desktop \
+		/usr/share/applications/onedriver-launcher.desktop \
 		/usr/share/man/man1/onedriver.1.gz
 	rm -rf /usr/share/icons/onedriver
 	mandb
diff --git a/onedriver.spec b/onedriver.spec
index 034eb919..a67bb304 100644
--- a/onedriver.spec
+++ b/onedriver.spec
@@ -51,7 +51,7 @@ cp %{name}-launcher %{buildroot}/%{_bindir}
 cp pkg/resources/%{name}.png %{buildroot}/usr/share/icons/%{name}
 cp pkg/resources/%{name}-128.png %{buildroot}/usr/share/icons/%{name}
 cp pkg/resources/%{name}.svg %{buildroot}/usr/share/icons/%{name}
-cp pkg/resources/%{name}.desktop %{buildroot}/usr/share/applications
+cp pkg/resources/%{name}-launcher.desktop %{buildroot}/usr/share/applications
 cp pkg/resources/%{name}@.service %{buildroot}/usr/lib/systemd/user
 cp pkg/resources/%{name}.1.gz %{buildroot}/usr/share/man/man1
 
@@ -65,7 +65,7 @@ cp pkg/resources/%{name}.1.gz %{buildroot}/usr/share/man/man1
 %attr(644, root, root) /usr/share/icons/%{name}/%{name}.png
 %attr(644, root, root) /usr/share/icons/%{name}/%{name}-128.png
 %attr(644, root, root) /usr/share/icons/%{name}/%{name}.svg
-%attr(644, root, root) /usr/share/applications/%{name}.desktop
+%attr(644, root, root) /usr/share/applications/%{name}-launcher.desktop
 %attr(644, root, root) /usr/lib/systemd/user/%{name}@.service
 %doc
 %attr(644, root, root) /usr/share/man/man1/%{name}.1.gz
diff --git a/pkg/debian/rules b/pkg/debian/rules
index 62fa6ace..5f68c32a 100755
--- a/pkg/debian/rules
+++ b/pkg/debian/rules
@@ -30,7 +30,7 @@ override_dh_auto_install:
 	install -D -m 0644 pkg/resources/onedriver.png $$(pwd)/debian/onedriver/usr/share/icons/onedriver/onedriver.png
 	install -D -m 0644 pkg/resources/onedriver-128.png $$(pwd)/debian/onedriver/usr/share/icons/onedriver/onedriver-128.png
 	install -D -m 0644 pkg/resources/onedriver.svg $$(pwd)/debian/onedriver/usr/share/icons/onedriver/onedriver.svg
-	install -D -m 0644 pkg/resources/onedriver.desktop $$(pwd)/debian/onedriver/usr/share/applications/onedriver.desktop
+	install -D -m 0644 pkg/resources/onedriver-launcher.desktop $$(pwd)/debian/onedriver/usr/share/applications/onedriver-launcher.desktop
 	install -D -m 0644 pkg/resources/onedriver@.service $$(pwd)/debian/onedriver/usr/lib/systemd/user/onedriver@.service
 	install -D -m 0644 pkg/resources/onedriver.1.gz $$(pwd)/debian/onedriver/usr/share/man/man1/onedriver.1.gz
 
diff --git a/pkg/resources/onedriver.desktop b/pkg/resources/onedriver-launcher.desktop
similarity index 100%
rename from pkg/resources/onedriver.desktop
rename to pkg/resources/onedriver-launcher.desktop