- fixed c&p typos

- added -python-install.patch (not checked, but Makefile
  produced from Makefile.in looks OK)
- still doesn't build - linking errors

Changed files:
    speech-dispatcher-python-install.patch -> 1.1
    speech-dispatcher.spec -> 1.2

diff --git a/speech-dispatcher-python-install.patch b/speech-dispatcher-python-install.patch
new file mode 100644 (file)
index 0000000..45e238d
--- /dev/null
+++ b/speech-dispatcher-python-install.patch
@@ -0,0 +1,37 @@
+diff -Nur b.speech-dispatcher-0.6.5/configure.in n.speech-dispatcher-0.6.5/configure.in
+--- b.speech-dispatcher-0.6.5/configure.in     2007-11-26 15:19:48.000000000 +0100
++++ n.speech-dispatcher-0.6.5/configure.in     2008-01-03 19:20:58.000000000 +0100
+@@ -246,5 +246,5 @@
+ AC_SUBST(LIB_SPD_REVISION)
+ AC_SUBST(LIB_SPD_AGE)
+ 
+-AC_OUTPUT([Makefile src/Makefile src/server/Makefile src/modules/Makefile src/c/Makefile src/c/api/Makefile src/c/clients/Makefile src/c/clients/say/Makefile src/c/clients/spdsend/Makefile src/tests/Makefile src/audio/Makefile config/Makefile config/modules/Makefile config/clients/Makefile doc/Makefile])
++AC_OUTPUT([Makefile src/Makefile src/server/Makefile src/modules/Makefile src/c/Makefile src/c/api/Makefile src/c/clients/Makefile src/c/clients/say/Makefile src/c/clients/spdsend/Makefile src/tests/Makefile src/audio/Makefile config/Makefile config/modules/Makefile config/clients/Makefile doc/Makefile src/python/Makefile])
+ 
+diff -Nur b.speech-dispatcher-0.6.5/src/python/Makefile.in n.speech-dispatcher-0.6.5/src/python/Makefile.in
+--- b.speech-dispatcher-0.6.5/src/python/Makefile.in   1970-01-01 01:00:00.000000000 +0100
++++ n.speech-dispatcher-0.6.5/src/python/Makefile.in   2008-01-03 19:26:41.000000000 +0100
+@@ -0,0 +1,23 @@
++
++all:
++
++install:
++      if test -x /usr/bin/python; then \
++              ./setup.py install --prefix=@prefix@ --root=$(DESTDIR); \
++      else \
++      echo "ERROR: Python not found or something went wrong during setup.py --install ..., not installing speechd module"; \
++      fi
++
++uninstall:
++
++clean:
++      rm -f *.py[co]
++      rm -rf build
++
++distclean: clean
++
++distdir:
++
++
++check:
++

diff --git a/speech-dispatcher.spec b/speech-dispatcher.spec
index 82ee1e417ed53a7f85d4a6825e2ada94e76f4760..6f9f2a9d9d633fc27c6e340cd69d7cca517aa654 100644 (file)
--- a/speech-dispatcher.spec
+++ b/speech-dispatcher.spec
@@ -15,6 +15,7 @@ License:      GPL v2
 Group:         Applications
 Source0:       http://www.freebsoft.org/pub/projects/speechd/%{name}-%{version}.tar.gz
 # Source0-md5: ad8cf47918207872ba976f2b2e47c02b
+Patch0:                %{name}-python-install.patch
 URL:           http://www.freebsoft.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -59,6 +60,7 @@ Statyczna biblioteka speed-dispatcher.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -68,11 +70,11 @@ Statyczna biblioteka speed-dispatcher.
 %{__automake}
 %configure \
        %{?with_flite:--with-flite}%{!?with_flite:--without-flite} \
-       %{?with_ibmtts:--with-ibmtts}%{!?with_flite:--without-ibmtts} \
-       %{?with_espeak:--with-espeak}%{!?with_flite:--without-espeak} \
-       %{?with_nas:--with-nas}%{!?with_flite:--without-nas} \
-       %{?with_alsa:--with-alsa}%{!?with_flite:--without-nas} \
-       %{?with_pulse:--with-pulse}%{!?with_flite:--without-pulse}
+       %{?with_ibmtts:--with-ibmtts}%{!?with_ibmtts:--without-ibmtts} \
+       %{?with_espeak:--with-espeak}%{!?with_espeak:--without-espeak} \
+       %{?with_nas:--with-nas}%{!?with_nas:--without-nas} \
+       %{?with_alsa:--with-alsa}%{!?with_alsa:--without-alsa} \
+       %{?with_pulse:--with-pulse}%{!?with_pulse:--without-pulse}
 
 %{__make}