From b560a5291dfaf4b40699ba1b0490711eeb081dec Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mar 24 2015 08:37:44 +0000
Subject: fix merge


---

diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec
index 619026a..0f98e4f 100644
--- a/speech-dispatcher.spec
+++ b/speech-dispatcher.spec
@@ -2,7 +2,7 @@
 
 Name:          speech-dispatcher
 Version:       0.8.2
-Release:       1%{?dist}
+Release:       3%{?dist}
 Summary:       To provide a high-level device independent layer for speech synthesis
 Group:         System Environment/Libraries
 
@@ -17,10 +17,12 @@ Source2:       speech-dispatcherd.service
 Patch1: thread-cancel-crash.patch
 
 BuildRequires: alsa-lib-devel
+BuildRequires: desktop-file-utils
 BuildRequires: dotconf-devel
 BuildRequires: espeak-devel
 BuildRequires: flite-devel
 Buildrequires: glib2-devel
+Buildrequires: intltool
 Buildrequires: libao-devel
 Buildrequires: libtool-ltdl-devel
 Buildrequires: pulseaudio-libs-devel
@@ -28,7 +30,6 @@ BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: texinfo
 BuildRequires: systemd
-BuildRequires: automake libtool intltool
 
 %ifnarch s390 s390x
 BuildRequires: libraw1394
@@ -38,8 +39,6 @@ Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 
-Requires: festival-freebsoft-utils
-
 %description
 * Common interface to different TTS engines
 * Handling concurrent synthesis requests – requests may come
@@ -58,7 +57,7 @@ Requires: festival-freebsoft-utils
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       speech-dispatcher = %{version}-%{release}
+Requires:       %{name}%{_isa} = %{version}-%{release}
 License:        GPLv2+
 
 %description    devel
@@ -69,7 +68,7 @@ developing applications that use %{name}.
 Summary:        Documentation for speech-dispatcher
 License:        GPLv2+
 Group:          Documentation
-Requires:       speech-dispatcher = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun):/sbin/install-info
 BuildArch: noarch
@@ -81,17 +80,42 @@ speechd documentation
 Summary:        Documentation for speech-dispatcher
 License:        GPLv2+
 Group:          Applications/System
-Requires:       speech-dispatcher = %{version}-%{release}
+Requires:       %{name}%{_isa} = %{version}-%{release}
 Requires:       python3-speechd = %{version}-%{release}
 
 %description utils
 Various utilities for speechd
 
+%package espeak
+Summary:        Speech Dispatcher espeak module
+Requires:       %{name}%{_isa} = %{version}-%{release}
+Obsoletes:      speech-dispatcher < 0.8.1-2
+
+%description espeak
+This package contains the espeak output module for Speech Dispatcher.
+
+%package festival
+Summary:        Speech Dispatcher festival module
+Requires:       %{name}%{_isa} = %{version}-%{release}
+Requires:       festival-freebsoft-utils
+Obsoletes:      speech-dispatcher < 0.8.1-2
+
+%description festival
+This package contains the festival output module for Speech Dispatcher.
+
+%package flite
+Summary:        Speech Dispatcher flite module
+Requires:       %{name}%{_isa} = %{version}-%{release}
+Obsoletes:      speech-dispatcher < 0.8.1-2
+
+%description flite
+This package contains the flite output module for Speech Dispatcher.
+
 %package -n python3-speechd
 Summary:        Python 3 Client API for speech-dispatcher
 License:        GPLv2+
 Group:          Development/Libraries
-Requires:       speech-dispatcher = %{version}-%{release}
+Requires:       %{name}%{_isa} = %{version}-%{release}
 Requires:       python3-pyxdg
 
 %description -n python3-speechd
@@ -141,6 +165,9 @@ mv %{buildroot}%{_datadir}/speech-dispatcher/conf/modules/* %{buildroot}%{_sysco
 # Create log dir
 mkdir -p -m 0700 %{buildroot}%{_localstatedir}/log/speech-dispatcher/
 
+# Verify the desktop files
+desktop-file-validate %{buildroot}/%{_datadir}/speech-dispatcher/conf/desktop/speechd.desktop
+
 # enable pulseaudio as default with a fallback to alsa
 sed 's/# AudioOutputMethod "pulse,alsa"/AudioOutputMethod "pulse,alsa"/' %{buildroot}%{_sysconfdir}/speech-dispatcher/speechd.conf
 
@@ -168,18 +195,26 @@ if [ $1 = 0 ]; then
 fi
 
 %files
-%doc NEWS README COPYING
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc NEWS README
 %dir %{_sysconfdir}/speech-dispatcher/
 %dir %{_sysconfdir}/speech-dispatcher/clients
 %dir %{_sysconfdir}/speech-dispatcher/modules
 %config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf
 %config(noreplace) %{_sysconfdir}/speech-dispatcher/clients/*.conf
 %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/*.conf
+%exclude %{_sysconfdir}/speech-dispatcher/modules/espeak*.conf
+%exclude %{_sysconfdir}/speech-dispatcher/modules/festival.conf
+%exclude %{_sysconfdir}/speech-dispatcher/modules/flite.conf
 %{_bindir}/speech-dispatcher
 %{_datadir}/speech-dispatcher/conf/desktop/speechd.desktop
 %{_libdir}/libspeechd.so.2
 %{_libdir}/libspeechd.so.2.5.0
-%{_libdir}/speech-dispatcher-modules/
+%dir %{_libdir}/speech-dispatcher-modules/
+%{_libdir}/speech-dispatcher-modules/sd_cicero
+%{_libdir}/speech-dispatcher-modules/sd_dummy
+%{_libdir}/speech-dispatcher-modules/sd_generic
 %dir %{_libdir}/speech-dispatcher
 %{_libdir}/speech-dispatcher/spd*.so
 %{_datadir}/sounds/speech-dispatcher
@@ -198,10 +233,29 @@ fi
 %{_bindir}/spd-say
 %{_bindir}/spdsend
 
+%files espeak
+%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/espeak.conf
+%{_libdir}/speech-dispatcher-modules/sd_espeak
+
+%files festival
+%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/festival.conf
+%{_libdir}/speech-dispatcher-modules/sd_festival
+
+%files flite
+%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/flite.conf
+%{_libdir}/speech-dispatcher-modules/sd_flite
+
 %files -n python3-speechd
 %{python3_sitearch}/speechd*
 
 %changelog
+* Fri Mar 20 2015 Peter Robinson <pbrobinson@fedoraproject.org> 0.8.2-3
+- Fix noarch docs Requires
+
+* Fri Mar 20 2015 Peter Robinson <pbrobinson@fedoraproject.org> 0.8.2-2
+- Use %%license
+- Make packaging more modular (rhbz #799140)
+
 * Fri Mar 20 2015 Peter Robinson <pbrobinson@fedoraproject.org> 0.8.2-1
 - 0.8.2