[discord] Bump release and add changelog entry
by Sérgio M. Basto
commit 1e291d9e5c62bdfd7b605c3fab421489810eabe5
Author: David Auer <dreua(a)posteo.de>
Date: Sun Feb 20 02:41:44 2022 +0100
Bump release and add changelog entry
discord.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/discord.spec b/discord.spec
index aca9ac5..8d0096c 100644
--- a/discord.spec
+++ b/discord.spec
@@ -5,7 +5,7 @@
Name: discord
Version: 0.0.17
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: All-in-one voice and text chat for gamers
# License Information: https://bugzilla.rpmfusion.org/show_bug.cgi?id=4441#c14
@@ -71,6 +71,11 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%changelog
+* Sun Feb 20 2022 David Auer <dreua(a)posteo.de> - 0.0.17-4
+- (#6108) Install icon to icons/hicolor and don't hardcode path in desktop file
+- Remove unnecessary build requirement: sed
+- Fix original desktop file being shipped
+
* Sat Feb 19 2022 Sérgio Basto <sergio(a)serjux.com> - 0.0.17-3
- (#6166) fixes conflicts with files with other packages
- Minor fixes (warning: File listed twice: /usr/lib64/discord/Discord)
2 years, 10 months
[discord] (#6108) Install icon to icons/hicolor
by Sérgio M. Basto
commit f43964b0917578b9ef7c6003f6999c4d3789c022
Author: David Auer <dreua(a)posteo.de>
Date: Sat Feb 19 13:42:54 2022 +0100
(#6108) Install icon to icons/hicolor
Fix hardcoded path in desktop file
Fixes: https://bugzilla.rpmfusion.org/show_bug.cgi?id=6108
discord.spec | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/discord.spec b/discord.spec
index 4079e8d..aca9ac5 100644
--- a/discord.spec
+++ b/discord.spec
@@ -27,6 +27,7 @@ Requires: libXtst%{_isa} >= 1.2
Requires: libappindicator%{_isa}
Requires: libcxx%{_isa}
Requires: libatomic%{_isa}
+Requires: hicolor-icon-theme
%if !0%{?el7}
Recommends: (libappindicator-gtk3%{_isa} if gtk3%{_isa})
@@ -48,7 +49,7 @@ mkdir -p %{buildroot}/%{_libdir}/discord
mkdir -p %{buildroot}/%{_datadir}/applications
desktop-file-install \
---set-icon=%{_libdir}/discord/discord.png \
+--set-icon=%{name} \
--set-key=Exec --set-value=%{_bindir}/Discord \
--delete-original \
--dir=%{buildroot}/%{_datadir}/applications \
@@ -56,11 +57,17 @@ discord.desktop
cp -r * %{buildroot}/%{_libdir}/discord/
ln -sf ../%{_lib}/discord/Discord %{buildroot}/%{_bindir}/
+install -p -D -m 644 %{name}.png \
+ %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+
+%check
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
%files
%{_libdir}/discord/
%{_bindir}/Discord
%{_datadir}/applications/discord.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%changelog
2 years, 10 months
[discord] Remove unnecessary build requirement: sed
by Sérgio M. Basto
commit 4ae91bbe68e1ac7b567955aff0dfe87fc1b6ed6a
Author: David Auer <dreua(a)posteo.de>
Date: Sat Feb 19 19:13:41 2022 +0100
Remove unnecessary build requirement: sed
discord.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/discord.spec b/discord.spec
index 511a48a..4079e8d 100644
--- a/discord.spec
+++ b/discord.spec
@@ -15,7 +15,6 @@ Source0: https://dl.discordapp.net/apps/linux/%{version}/%{name}-%{versio
ExclusiveArch: x86_64
BuildRequires: desktop-file-utils%{_isa}
-BuildRequires: sed%{_isa}
Requires: glibc%{_isa}
Requires: alsa-lib%{_isa}
2 years, 10 months
[discord] Fix original desktop file being shipped
by Sérgio M. Basto
commit 6d4a05d72b1f4344e57292cae08703caeb7c29fa
Author: David Auer <dreua(a)posteo.de>
Date: Sat Feb 19 13:01:59 2022 +0100
Fix original desktop file being shipped
discord.spec | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/discord.spec b/discord.spec
index 0b46d77..511a48a 100644
--- a/discord.spec
+++ b/discord.spec
@@ -48,8 +48,6 @@ mkdir -p %{buildroot}/%{_bindir}/
mkdir -p %{buildroot}/%{_libdir}/discord
mkdir -p %{buildroot}/%{_datadir}/applications
-cp -r * %{buildroot}/%{_libdir}/discord/
-ln -sf ../%{_lib}/discord/Discord %{buildroot}/%{_bindir}/
desktop-file-install \
--set-icon=%{_libdir}/discord/discord.png \
--set-key=Exec --set-value=%{_bindir}/Discord \
@@ -57,6 +55,9 @@ desktop-file-install \
--dir=%{buildroot}/%{_datadir}/applications \
discord.desktop
+cp -r * %{buildroot}/%{_libdir}/discord/
+ln -sf ../%{_lib}/discord/Discord %{buildroot}/%{_bindir}/
+
%files
%{_libdir}/discord/
%{_bindir}/Discord
2 years, 10 months
