From df4b56609dddb3f30e3554e5615d6cb5e7c1a3dd Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Wed, 7 Aug 2019 10:33:36 -0500
Subject: [PATCH] -qpaeq: use python3 (#1738047)

---
 pulseaudio-12.2-qpaeq_python2.patch |  9 ---------
 pulseaudio-qpaeq_python3.patch      | 18 ++++++++++++++++++
 pulseaudio.spec                     | 17 ++++++++---------
 3 files changed, 26 insertions(+), 18 deletions(-)
 delete mode 100644 pulseaudio-12.2-qpaeq_python2.patch
 create mode 100644 pulseaudio-qpaeq_python3.patch

diff --git a/pulseaudio-12.2-qpaeq_python2.patch b/pulseaudio-12.2-qpaeq_python2.patch
deleted file mode 100644
index 0aaeb6b..0000000
--- a/pulseaudio-12.2-qpaeq_python2.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up pulseaudio-12.2/src/utils/qpaeq.python2 pulseaudio-12.2/src/utils/qpaeq
---- pulseaudio-12.2/src/utils/qpaeq.python2	2018-07-13 14:06:13.000000000 -0500
-+++ pulseaudio-12.2/src/utils/qpaeq	2019-02-12 14:42:13.082480470 -0600
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2
- #    qpaeq is a equalizer interface for pulseaudio's equalizer sinks
- #    Copyright (C) 2009  Jason Newton <nevion@gmail.com
- #
diff --git a/pulseaudio-qpaeq_python3.patch b/pulseaudio-qpaeq_python3.patch
new file mode 100644
index 0000000..d49a4c0
--- /dev/null
+++ b/pulseaudio-qpaeq_python3.patch
@@ -0,0 +1,18 @@
+diff -up pulseaudio-12.99.2/src/utils/qpaeq.qpaeq_python2 pulseaudio-12.99.2/src/utils/qpaeq
+--- pulseaudio-12.99.2/src/utils/qpaeq.qpaeq_python2	2019-07-04 19:06:47.000000000 -0500
++++ pulseaudio-12.99.2/src/utils/qpaeq	2019-08-07 10:30:03.134944372 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ #    qpaeq is a equalizer interface for pulseaudio's equalizer sinks
+ #    Copyright (C) 2009  Jason Newton <nevion@gmail.com
+ #
+@@ -18,7 +18,7 @@
+ 
+ import os,math,sys
+ try:
+-    import PyQt5,sip
++#    import PyQt5,sip
+     from PyQt5 import QtWidgets,QtCore
+     import dbus.mainloop.pyqt5
+     import dbus
diff --git a/pulseaudio.spec b/pulseaudio.spec
index e8797e6..422c390 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -31,7 +31,7 @@
 Name:           pulseaudio
 Summary:        Improved Linux Sound Server
 Version:        %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release:        1%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release:        2%{?snap:.%{snap}git%{shortcommit}}%{?dist}
 License:        LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/PulseAudio
 %if 0%{?gitrel}
@@ -55,8 +55,8 @@ Patch201: pulseaudio-autostart.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1265267
 Patch202: pulseaudio-9.0-disable_flat_volumes.patch
 
-# explicitly use /usr/bin/python2
-Patch203: pulseaudio-12.2-qpaeq_python2.patch
+# explicitly use /usr/bin/python3
+Patch203: pulseaudio-qpaeq_python3.patch
 
 # disable autospawn
 Patch206: pulseaudio-11.1-autospawn_disable.patch
@@ -133,12 +133,8 @@ Enlightened Sound Daemon (ESOUND).
 %package qpaeq
 Summary:	Pulseaudio equalizer interface
 Requires: 	%{name}%{?_isa} = %{version}-%{release}
-Requires:	python2-qt5
-%if 0%{?fedora} < 28 && 0%{?rhel} < 8
-Requires:	dbus-python
-%else
-Requires:	python2-dbus
-%endif
+Requires:	python3-qt5-base
+Requires:	python3-dbus
 %description qpaeq
 qpaeq is a equalizer interface for pulseaudio's equalizer sinks.
 
@@ -656,6 +652,9 @@ systemctl --no-reload preset --global pulseaudio.socket >/dev/null 2>&1 || :
 
 
 %changelog
+* Wed Aug 07 2019 Rex Dieter <rdieter@fedoraproject.org> - 12.99.2-2
+- -qpaeq: use python3 (#1738047)
+
 * Tue Aug 06 2019 Rex Dieter <rdieter@fedoraproject.org> - 12.99.2-1
 - pulseaudio-12.99.2