From e03f4db96f5cd07b36b98189e12e9c4461dd9371 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Jul 03 2018 14:40:01 +0000
Subject: missing StartupWMClass=konversation in .desktop file (#1590462)

move script/desktop modifiations to %prep (ie, like patching)
fix byte-compile warning (python2 vs python3)

---

diff --git a/konversation.spec b/konversation.spec
index b779dad..f00f880 100644
--- a/konversation.spec
+++ b/konversation.spec
@@ -1,7 +1,7 @@
 
 Name:           konversation
 Version:        1.7.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A user friendly IRC client
 
 License:        GPLv2+
@@ -47,8 +47,10 @@ BuildRequires: perl-generators
 BuildRequires: pkgconfig(phonon4qt5)
 BuildRequires: pkgconfig(qca2-qt5)
 BuildRequires: pkgconfig(Qt5Widgets)
-# python macros
+# python3
+BuildRequires: python3
 BuildRequires: python3-rpm-macros
+%global __python %{_python3}
 BuildRequires: sed
 
 Requires: qca-qt5-ossl%{?_isa}
@@ -64,6 +66,26 @@ to chat windows; configurable background colors and much more
 %prep
 %autosetup -n %{name}-%{version}%{?beta:-%{beta}} -p1
 
+# Add Comment key to .desktop file
+grep '^Comment=' %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop || \
+desktop-file-edit \
+  --set-comment="A user friendly IRC client" \
+  data/org.kde.%{name}.desktop
+
+# Add StartupWMClass to .desktop
+grep '^StartupWMClass=' %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop || \
+desktop-file-edit \
+  --set-key=StartupWMClass --set-value=konversation \
+  data/org.kde.%{name}.desktop
+
+# purge use of /usr/bin/env
+sed -i \
+  -e "s|^#!/usr/bin/env bash|#!/bin/bash|g" \
+  -e "s|^#!/usr/bin/env perl|#!/usr/bin/perl|g" \
+  -e "s|^#!/usr/bin/env python$|#!%{__python3}|g" \
+  data/scripts/* \
+  data/scripting_support/python/konversation/*.py
+
 
 %build
 mkdir %{_target_platform}
@@ -81,21 +103,6 @@ install -p -m644 -D %{SOURCE1} %{buildroot}%{_kf5_sysconfdir}/xdg/konversationrc
 
 %find_lang konversation --with-html
 
-# Add Comment key to .desktop file
-grep '^Comment=' %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop || \
-desktop-file-install \
-  --dir=%{buildroot}%{_kf5_datadir}/applications \
-  --set-comment="%{summary}" \
-  %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop
-
-# purge use of /usr/bin/env
-sed -i \
-  -e "s|^#!/usr/bin/env bash|#!/bin/bash|g" \
-  -e "s|^#!/usr/bin/env perl|#!/usr/bin/perl|g" \
-  -e "s|^#!/usr/bin/env python$|#!%{__python3}|g" \
-  %{buildroot}%{_kf5_datadir}/konversation/scripts/* \
-  %{buildroot}%{_kf5_datadir}/konversation/scripting_support/python/konversation/*.py
-
 
 %check
 appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.konversation.appdata.xml ||:
@@ -133,6 +140,11 @@ fi
 
 
 %changelog
+* Tue Jul 03 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.7.5-2
+- missing StartupWMClass=konversation in .desktop file (#1590462)
+- move script/desktop modifiations to %%prep (ie, like patching)
+- fix byte-compile warning (python2 vs python3)
+
 * Sat Jun 30 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.7.5-1
 - konversation-1.7.5