[arch-commits] Commit in speech-dispatcher/trunk (3 files)

[Eric Bélanger]

    Date: Saturday, March 9, 2013 @ 02:48:59
  Author: eric
Revision: 179644

upgpkg: speech-dispatcher 0.8-1

Upstream update, Add libltdl and python-xdg depends, Add intltool makedepends, Update to python 3 support, Remove initscripts support, Update info pages in install script, PKGBUILD clean up

Modified:
  speech-dispatcher/trunk/PKGBUILD
  speech-dispatcher/trunk/speech-dispatcher.install
Deleted:
  speech-dispatcher/trunk/speechd.sh

---------------------------+
 PKGBUILD                  |   33 ++++++++++-----------------------
 speech-dispatcher.install |    3 ++-
 speechd.sh                |   37 -------------------------------------
 3 files changed, 12 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-09 00:35:40 UTC (rev 179643)
+++ PKGBUILD	2013-03-09 01:48:59 UTC (rev 179644)
@@ -7,14 +7,14 @@
 # Contributor: Andreas Messer <andi at bupfen.de>
 
 pkgname=speech-dispatcher
-pkgver=0.7.1
-pkgrel=7
+pkgver=0.8
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="High-level device independent layer for speech synthesis interface"
 url="http://www.freebsoft.org/speechd"
 license=('GPL2' 'FDL')
-depends=('glib2' 'python2' 'dotconf' 'texinfo' 'libpulse')
-makedepends=('pkgconfig' 'espeak')
+depends=('glib2' 'libltdl' 'python-xdg' 'dotconf' 'libpulse')
+makedepends=('intltool' 'espeak')
 optdepends=('festival: Speech output using Festival'
         'espeak: Speech output using ESpeak'
         'pulseaudio: PulseAudio support')
@@ -37,10 +37,9 @@
 	etc/speech-dispatcher/speechd.conf)
 install="${pkgname}.install"
 source=("http://www.freebsoft.org/pub/projects/speechd/$pkgname-$pkgver.tar.gz"
-        'speechd.sh' 'speech-dispatcherd.service')
-md5sums=('ccfc30ac006673d36b4223eb760ed696'
-        '858293f464b83f03f3b6bb796291c71d'
-        'd26f52e2e95a30eaa83560f0e63faca5')
+        'speech-dispatcherd.service')
+md5sums=('d88691a64c676122f996230c107c392f'
+         'd26f52e2e95a30eaa83560f0e63faca5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -53,20 +52,8 @@
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 
-  install -Dm755 ${srcdir}/speechd.sh ${pkgdir}/etc/rc.d/speechd
-  install -d "${pkgdir}/usr/lib/systemd/system/"
-  install -m644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/"
-  install -d ${pkgdir}/var/log/speech-dispatcher
-
-  # Fix spd-conf to use python 2.7
-  sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' ${pkgdir}/usr/bin/spd-conf
-  sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/lib/python2.7/site-packages/speechd/_test.py
-  
-  rm -f ${pkgdir}/usr/share/info/dir
-  gzip -9nf ${pkgdir}/usr/share/info/*
-
-  # Remove conflicts with erlang (FS#21674)
-  rm -r ${pkgdir}/usr/bin/run_test
+  install -Dm644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/speech-dispatcherd.service"
+  install -d "${pkgdir}/var/log/speech-dispatcher"
 }

Modified: speech-dispatcher.install
===================================================================
--- speech-dispatcher.install	2013-03-09 00:35:40 UTC (rev 179643)
+++ speech-dispatcher.install	2013-03-09 01:48:59 UTC (rev 179644)
@@ -1,10 +1,10 @@
 info_dir=usr/share/info
 info_files=('speech-dispatcher.info'
-    'speech-dispatcher-cs.info'
     'ssip.info'
     'spd-say.info')
 
 post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
   for f in ${info_files[@]}; do
     install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
@@ -15,6 +15,7 @@
 }
 
 pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
   for f in ${info_files[@]}; do
     install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done

Deleted: speechd.sh
===================================================================
--- speechd.sh	2013-03-09 00:35:40 UTC (rev 179643)
+++ speechd.sh	2013-03-09 01:48:59 UTC (rev 179644)
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/speech-dispatcher)
-case "$1" in
-  start)
-    stat_busy "Starting speech dispatcher Daemon"
-    [ -z "$PID" ] && /usr/bin/speech-dispatcher -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon speechd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping speech dispatcher Daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon speechd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
-exit 0