From f2947ef429bbcd935eb76473789cd235bf37524e Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Thu, 21 Sep 2023 18:50:28 +0000
Subject: [PATCH] import CS hexchat-2.16.0-2.el9

---
 ...t-Install-icons-as-io.github.Hexchat.patch | 46 +++++++++++++++++++
 SPECS/hexchat.spec                            | 11 ++++-
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 SOURCES/hexchat-Install-icons-as-io.github.Hexchat.patch

diff --git a/SOURCES/hexchat-Install-icons-as-io.github.Hexchat.patch b/SOURCES/hexchat-Install-icons-as-io.github.Hexchat.patch
new file mode 100644
index 0000000..d8fb3a3
--- /dev/null
+++ b/SOURCES/hexchat-Install-icons-as-io.github.Hexchat.patch
@@ -0,0 +1,46 @@
+From dac8ace90cffef656b1292c8d91648cc722c28fe Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <tingping@tingping.se>
+Date: Mon, 25 Oct 2021 15:02:22 -0500
+Subject: [PATCH] Install icons as io.github.Hexchat
+
+This matches our app-id as the desktop-file spec recommends.
+
+This also fixes a bug where our notifications referred to this new
+name already.
+---
+ data/icons/meson.build                    | 2 ++
+ data/misc/io.github.Hexchat.desktop.in.in | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/data/icons/meson.build b/data/icons/meson.build
+index d7926e831259..710e0045f24b 100644
+--- a/data/icons/meson.build
++++ b/data/icons/meson.build
+@@ -1,9 +1,11 @@
+ icondir = join_paths(get_option('datadir'), 'icons/hicolor')
+ install_data(
+   'hexchat.png',
++  rename: 'io.github.Hexchat.png',
+   install_dir: join_paths(icondir, '48x48/apps')
+ )
+ install_data(
+   'hexchat.svg',
++  rename: 'io.github.Hexchat.svg',
+   install_dir: join_paths(icondir, 'scalable/apps')
+ )
+diff --git a/data/misc/io.github.Hexchat.desktop.in.in b/data/misc/io.github.Hexchat.desktop.in.in
+index 7bf6a9a8110c..5e00ce8f2539 100644
+--- a/data/misc/io.github.Hexchat.desktop.in.in
++++ b/data/misc/io.github.Hexchat.desktop.in.in
+@@ -4,7 +4,7 @@ GenericName=IRC Client
+ Comment=Chat with other people online
+ Keywords=IM;Chat;
+ Exec=@exec_command@
+-Icon=hexchat
++Icon=io.github.Hexchat
+ Terminal=false
+ Type=Application
+ Categories=GTK;Network;IRCClient;
+-- 
+2.41.0
+
diff --git a/SPECS/hexchat.spec b/SPECS/hexchat.spec
index 4d14ed3..c66ae57 100644
--- a/SPECS/hexchat.spec
+++ b/SPECS/hexchat.spec
@@ -3,11 +3,14 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      hexchat
 Version:   2.16.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 URL:       https://hexchat.github.io
 Source:    https://dl.hexchat.net/hexchat/%{name}-%{version}.tar.xz
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=2051561
+Patch0:    hexchat-Install-icons-as-io.github.Hexchat.patch
+
 BuildRequires: gcc
 BuildRequires: meson
 BuildRequires: hicolor-icon-theme
@@ -63,7 +66,7 @@ This package contains the development files for %{name}.
 %{_libdir}/hexchat/plugins/python.so
 %{_libdir}/hexchat/python
 %{_datadir}/applications/%{app_id}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/icons/hicolor/*/apps/%{app_id}.*
 %{_datadir}/metainfo/%{app_id}.appdata.xml
 %{_datadir}/dbus-1/services/org.hexchat.service.service
 %{_mandir}/man1/*.gz
@@ -73,6 +76,10 @@ This package contains the development files for %{name}.
 %{_libdir}/pkgconfig/hexchat-plugin.pc
 
 %changelog
+* Mon Jul 10 2023 Debarshi Ray <rishi@fedoraproject.org> - 2.16.0-2
+- Unbreak notification icon
+Resolves: #2051561
+
 * Mon Dec 13 2021 Debarshi Ray <rishi@fedoraproject.org> - 2.16.0-1
 - Update to 2.16.0
 Resolves: #1965883