+ speech-dispatcher-0.8.8-8

Remove pyxdg dependency

0001-Remove-pyxdg-dependency.patch

@@ -0,0 +1,45 @@
+From 5ede80b0713c75b21925203c3ef389c86cb69e6d Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 20 Jul 2018 15:04:48 +0200
+Subject: [PATCH] Remove pyxdg dependency
+
+And use the same algorithm as GLib to determine the base user config
+directory (XDG_CONFIG_HOME, then ~/.config then /tmp/$USERNAME/.config)
+---
+ src/api/python/speechd_config/config.py.in | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/api/python/speechd_config/config.py.in b/src/api/python/speechd_config/config.py.in
+index ccf8803..e8393e5 100644
+--- a/src/api/python/speechd_config/config.py.in
++++ b/src/api/python/speechd_config/config.py.in
+@@ -30,8 +30,6 @@ import socket
+ import sys
+ import time
+ 
+-from xdg import BaseDirectory
+-
+ # Locale/gettext configuration
+ 
+ locale.setlocale(locale.LC_ALL, '')
+@@ -167,7 +165,16 @@ class Tests:
+ 
+     def user_conf_dir(self):
+         """Return user configuration directory"""
+-        return os.path.join(BaseDirectory.xdg_config_home, "speech-dispatcher")
++        config_dir = os.environ['XDG_CONFIG_HOME']
++        if not config_dir:
++            home_dir = os.environ['HOME']
++            if home_dir:
++                config_dir = os.path.join(home_dir, ".config")
++            else:
++                tmpdir = os.environ['TMPDIR'] or "/tmp/"
++                config_dir = os.path.join(tmpdir, os.getlogin(), ".config")
++
++        return os.path.join(config_dir, "speech-dispatcher")
+ 
+     def system_conf_dir(self):
+         """Determine system configuration directory"""
+-- 
+2.17.1
+

speech-dispatcher.spec

@@ -2,7 +2,7 @@
 
 Name:          speech-dispatcher
 Version:       0.8.8
-Release:       7%{?dist}
+Release:       8%{?dist}
 Summary:       To provide a high-level device independent layer for speech synthesis
 Group:         System Environment/Libraries
 
@@ -16,8 +16,9 @@ Source1:       http://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1
 Source2:       speech-dispatcherd.service
 
 Patch1:        0001-Make-espeak-ng-the-default-output-module.patch
+Patch2:        0001-Remove-pyxdg-dependency.patch
 
-BuildRequires:  gcc
+BuildRequires: gcc
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: dotconf-devel
@@ -33,6 +34,7 @@ BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: texinfo
 BuildRequires: systemd
+BuildRequires: git
 
 Requires: speech-dispatcher-espeak-ng
 Requires(post): systemd
@@ -116,14 +118,12 @@ Summary:        Python 3 Client API for speech-dispatcher
 License:        GPLv2+
 Group:          Development/Libraries
 Requires:       %{name}%{_isa} = %{version}-%{release}
-Requires:       python3-pyxdg
 
 %description -n python3-speechd
 Python 3 module for speech-dispatcher
 
 %prep
-%setup -q
-%patch1 -p1
+%autosetup -S git
 
 tar xf %{SOURCE1}
 
@@ -268,6 +268,10 @@ fi
 %{python3_sitearch}/speechd*
 
 %changelog
+* Fri Jul 20 2018 Bastien Nocera <bnocera@redhat.com> - 0.8.8-8
++ speech-dispatcher-0.8.8-8
+- Remove pyxdg dependency
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.8-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild