clean these up and stream line the process

diff --git a/freeswitch-sounds-en-us-callie.spec b/freeswitch-sounds-en-us-callie.spec
index 68c79e42b667f78a5b03570187a71791d6b93510..025eda0d5352a452e908d31fd09cd64be0c6f8cd 100644 (file)
--- a/freeswitch-sounds-en-us-callie.spec
+++ b/freeswitch-sounds-en-us-callie.spec
@@ -73,6 +73,9 @@ Group: Applications/Communications
 Packager: Patrick Laimbock <vc-rpms@voipconsulting.nl>
 URL: http://www.freeswitch.org
 Source0:http://files.freeswitch.org/%{name}-48000-%{version}.tar.gz
+Source1:http://files.freeswitch.org/%{name}-32000-%{version}.tar.gz
+Source2:http://files.freeswitch.org/%{name}-16000-%{version}.tar.gz
+Source3:http://files.freeswitch.org/%{name}-8000-%{version}.tar.gz
 BuildArch: noarch
 BuildRequires: sox
 Requires: freeswitch
@@ -139,25 +142,11 @@ FreeSWITCH Callie prompts package that pulls in the 8KHz, 16KHz,
 ##############################################################################
 
 %prep
-%setup -b0 -q -n en
-mkdir -p ./usr/callie
-# create buildsounds-callie.sh script in working dir
-echo  '#!/bin/bash
-
-sounds_location=$1
-for rate in 32000 16000 8000
-do 
-    for i in ascii base256 conference currency digits directory ivr misc phonetic-ascii time voicemail zrtp
-    do
-       mkdir -p $sounds_location/$i/$rate
-       for f in `find $sounds_location/$i/48000 -name \*.wav`
-       do
-           echo "generating" $sounds_location/$i/$rate/`basename $f`
-           sox $f -r $rate $sounds_location/$i/$rate/`basename $f`
-       done
-    done
-done' > ./us/callie/buildsounds-callie.sh
-%{__chmod} 0750 ./us/callie/buildsounds-callie.sh
+%setup -n en
+%setup -T -D -b 0 -n en
+%setup -T -D -b 1 -n en
+%setup -T -D -b 2 -n en
+%setup -T -D -b 3 -n en
 
 ##############################################################################
 # Build
@@ -180,7 +169,6 @@ pushd us/callie
 # first install the 48KHz sounds
 %{__cp} -prv ./* %{buildroot}%{SOUNDSDIR}/en/us/callie
 # now resample the 48KHz ones to 8KHz, 16KHz and 32KHz
-./buildsounds-callie.sh %{buildroot}%{SOUNDSDIR}/en/us/callie
 popd
 
 ##############################################################################
@@ -196,8 +184,6 @@ popd
 
 %post
 # generate the 8KHz, 16KHz and 32KHz prompts from the 48KHz ones
-cd %{SOUNDSDIR}/en/us/callie
-./buildsounds-callie.sh %{SOUNDSDIR}/en/us/callie
 
 ##############################################################################
 # Postun
@@ -214,7 +200,6 @@ cd %{SOUNDSDIR}/en/us/callie
 
 %files
 %defattr(-,root,root)
-%attr(0750,freeswitch,daemon)          %{SOUNDSDIR}/en/us/callie/buildsounds-callie.sh
 
 %files -n freeswitch-sounds-en-us-callie-8000
 %defattr(-,root,root,-)

diff --git a/scripts/ci/sounds-en-us-callie.sh b/scripts/ci/sounds-en-us-callie.sh
index 3df278c621930a18a39d3e592dc3347d5bdf1c2b..255d511516df7796649acd5eb7150ac753f4e7ca 100755 (executable)
--- a/scripts/ci/sounds-en-us-callie.sh
+++ b/scripts/ci/sounds-en-us-callie.sh
@@ -12,6 +12,8 @@ build="$2"
 
 basedir=$(pwd);
 
+(mkdir -p rpmbuild && cd rpmbuild && mkdir -p SOURCES BUILD BUILDROOT i386 x86_64 SPECS)
+
 if [ ! -d "$basedir/../freeswitch-sounds" ]; then
        cd $basedir/..
        git clone https://stash.freeswitch.org/scm/fs/freeswitch-sounds.git 
@@ -21,9 +23,12 @@ else
 fi
 
 cd $basedir/../freeswitch-sounds/sounds/trunk
-perl dist.pl
+# perl dist.pl
 
-cp * freeswitch-sounds-*48000*.tar.gz $basedir/rpmbuild/SOURCES
+mv freeswitch-sounds-*48000*.tar.gz $basedir/rpmbuild/SOURCES
+mv freeswitch-sounds-*32000*.tar.gz $basedir/rpmbuild/SOURCES
+mv freeswitch-sounds-*16000*.tar.gz $basedir/rpmbuild/SOURCES
+mv freeswitch-sounds-*8000*.tar.gz $basedir/rpmbuild/SOURCES
 
 cd $basedir