FS-11567: [Build-System] CentOS packaging: Sound logic cleanup.

diff --git a/freeswitch-sounds-en-ca-june.spec b/freeswitch-sounds-en-ca-june.spec
index 78cc361f347c6e612a14a4c968f9768c49f407b2..880d1d0504713c0f4500c09869187cbe73015e7a 100644 (file)
--- a/freeswitch-sounds-en-ca-june.spec
+++ b/freeswitch-sounds-en-ca-june.spec
@@ -2,7 +2,7 @@
 # Copyright and license
 ##############################################################################
 #
-# Spec file for package freeswitch-sounds-en-ca-june (version 1.0.50-1)
+# Spec file for package freeswitch-sounds-en-ca-june (version 1.0.51-1)
 #
 # Based on parts by Copyright (c) 2009 Patrick Laimbock 
 # Copyright (c) 2014 FreeSWITCH.org
@@ -14,7 +14,7 @@
 # Set variables
 ##############################################################################
 
-%define version        1.0.50
+%define version        1.0.51
 %define release        1
 
 %define fsname  freeswitch
@@ -314,5 +314,7 @@ popd
 ##############################################################################
 
 %changelog
+* Fri Apr 19 2019 Andrey Volk <andrey@signalwire.com> - 1.0.51-1
+- version bump
 * Fri Sep 12 2014 Ken Rice <krice@freeswitch.org> - 1.0.50-1
 - created out of the spec file for june

diff --git a/freeswitch-sounds-en-us-allison.spec b/freeswitch-sounds-en-us-allison.spec
index d92eb74f592b9547f1b6171751f2ae258922ed4a..26d386461d9abf5b926c0a86bacaac2baa955d52 100644 (file)
--- a/freeswitch-sounds-en-us-allison.spec
+++ b/freeswitch-sounds-en-us-allison.spec
@@ -2,7 +2,7 @@
 # Copyright and license
 ##############################################################################
 #
-# Spec file for package freeswitch-sounds-en-us-allison (version 1.0.0-1)
+# Spec file for package freeswitch-sounds-en-us-allison (version 1.0.1-1)
 #
 # Copyright (c) 2009 Patrick Laimbock 
 # Some fixes and additions (c) 2011 Michal Bielicki
@@ -20,7 +20,7 @@
 # Set variables
 ##############################################################################
 
-%define version 1.0.0
+%define version 1.0.1
 %define release 1
 
 %define fsname  freeswitch
@@ -203,6 +203,7 @@ popd
 
 %files -n freeswitch-sounds-en-us-allison-8000
 %defattr(-,root,root,-)
+%attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/alt/8000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/ascii/8000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/base256/8000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/conference/8000
@@ -211,10 +212,10 @@ popd
 %attr(0750,freeswitch,daemon)   %dir    %{SOUNDSDIR}/en/us/allison/directory/8000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/ivr/8000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/misc/8000
-%attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/phonetic-ascii/8000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/time/8000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/voicemail/8000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/zrtp/8000
+%attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/alt/8000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/ascii/8000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/base256/8000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/conference/8000/*.wav
@@ -223,13 +224,13 @@ popd
 %attr(0640,freeswitch,daemon)           %{SOUNDSDIR}/en/us/allison/directory/8000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/ivr/8000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/misc/8000/*.wav
-%attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/phonetic-ascii/8000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/time/8000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/voicemail/8000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/zrtp/8000/*.wav
 
 %files -n freeswitch-sounds-en-us-allison-16000
 %defattr(-,root,root,-)
+%attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/alt/16000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/ascii/16000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/base256/16000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/conference/16000
@@ -238,10 +239,10 @@ popd
 %attr(0750,freeswitch,daemon)   %dir    %{SOUNDSDIR}/en/us/allison/directory/16000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/ivr/16000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/misc/16000
-%attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/phonetic-ascii/16000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/time/16000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/voicemail/16000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/zrtp/16000
+%attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/alt/16000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/ascii/16000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/base256/16000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/conference/16000/*.wav
@@ -250,13 +251,13 @@ popd
 %attr(0640,freeswitch,daemon)           %{SOUNDSDIR}/en/us/allison/directory/16000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/ivr/16000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/misc/16000/*.wav
-%attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/phonetic-ascii/16000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/time/16000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/voicemail/16000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/zrtp/16000/*.wav
 
 %files -n freeswitch-sounds-en-us-allison-32000
 %defattr(-,root,root,-)
+%attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/alt/32000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/ascii/32000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/base256/32000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/conference/32000
@@ -265,10 +266,10 @@ popd
 %attr(0750,freeswitch,daemon)   %dir    %{SOUNDSDIR}/en/us/allison/directory/32000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/ivr/32000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/misc/32000
-%attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/phonetic-ascii/32000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/time/32000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/voicemail/32000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/zrtp/32000
+%attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/alt/32000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/ascii/32000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/base256/32000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/conference/32000/*.wav
@@ -277,13 +278,13 @@ popd
 %attr(0640,freeswitch,daemon)           %{SOUNDSDIR}/en/us/allison/directory/32000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/ivr/32000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/misc/32000/*.wav
-%attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/phonetic-ascii/32000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/time/32000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/voicemail/32000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/zrtp/32000/*.wav
 
 %files -n freeswitch-sounds-en-us-allison-48000
 %defattr(-,root,root,-)
+%attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/alt/48000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/ascii/48000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/base256/48000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/conference/48000
@@ -292,10 +293,10 @@ popd
 %attr(0750,freeswitch,daemon)   %dir    %{SOUNDSDIR}/en/us/allison/directory/48000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/ivr/48000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/misc/48000
-%attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/phonetic-ascii/48000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/time/48000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/voicemail/48000
 %attr(0750,freeswitch,daemon)  %dir    %{SOUNDSDIR}/en/us/allison/zrtp/48000
+%attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/alt/48000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/ascii/48000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/base256/48000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/conference/48000/*.wav
@@ -304,7 +305,6 @@ popd
 %attr(0640,freeswitch,daemon)           %{SOUNDSDIR}/en/us/allison/directory/48000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/ivr/48000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/misc/48000/*.wav
-%attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/phonetic-ascii/48000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/time/48000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/voicemail/48000/*.wav
 %attr(0640,freeswitch,daemon)          %{SOUNDSDIR}/en/us/allison/zrtp/48000/*.wav
@@ -316,6 +316,9 @@ popd
 ##############################################################################
 
 %changelog
+* Fri Apr 19 2019 Andrey Volk <andrey@signalwire.com> - 1.0.1-1
+- add missing alt folder and remove non-existing items
+- bump up version
 * Tue Jul 25 2017 Mike Jerris <mike@freeswitch.org> - 1.0.0-1
 - update to FHS Layout for FreeSWITCH
 - bump up version

diff --git a/freeswitch-sounds-en-us-callie.spec b/freeswitch-sounds-en-us-callie.spec
index 210e6f5df62c7e24bd9489a2d240d6f0b8abb982..537e5668ef255cee2858392015431da6dc65c0af 100644 (file)
--- a/freeswitch-sounds-en-us-callie.spec
+++ b/freeswitch-sounds-en-us-callie.spec
@@ -2,7 +2,7 @@
 # Copyright and license
 ##############################################################################
 #
-# Spec file for package freeswitch-sounds-en-us-callie (version 1.0.18-1)
+# Spec file for package freeswitch-sounds-en-us-callie (version 1.0.52-1)
 #
 # Copyright (c) 2009 Patrick Laimbock 
 # Some fixes and additions (c) 2011 Michal Bielicki
@@ -20,7 +20,7 @@
 # Set variables
 ##############################################################################
 
-%define version 1.0.50
+%define version 1.0.52
 %define release 1
 
 %define fsname  freeswitch
@@ -316,6 +316,8 @@ popd
 ##############################################################################
 
 %changelog
+* Fri Apr 19 2019 Andrey Volk <andrey@signalwire.com> - 1.0.52-1
+- bump up version
 * Sun Mar 05 2012 Ken Rice <krice@freeswitch.org> - 1.0.18-1
 - update to FHS Layout for FreeSWITCH
 - bump up version

diff --git a/freeswitch-sounds-fr-ca-june.spec b/freeswitch-sounds-fr-ca-june.spec
index d926e84ba1811e43c947128800317370f31edcbf..c8d413d4abea5547edc058eb7e10cabec14061e9 100644 (file)
--- a/freeswitch-sounds-fr-ca-june.spec
+++ b/freeswitch-sounds-fr-ca-june.spec
@@ -2,7 +2,7 @@
 # Copyright and license
 ##############################################################################
 #
-# Spec file for package freeswitch-sounds-fr-ca-june (version 1.0.50-1)
+# Spec file for package freeswitch-sounds-fr-ca-june (version 1.0.51-1)
 #
 # Based on parts by Copyright (c) 2009 Patrick Laimbock 
 # Copyright (c) 2014 FreeSWITCH.org
@@ -14,7 +14,7 @@
 # Set variables
 ##############################################################################
 
-%define version        1.0.50
+%define version        1.0.51
 %define release        1
 
 %define fsname  freeswitch
@@ -322,5 +322,7 @@ popd
 ##############################################################################
 
 %changelog
+* Fri Apr 19 2019 Andrey Volk <andrey@signalwire.com> - 1.0.51-1
+- bump up version
 * Fri Sep 12 2014 Ken Rice <krice@freeswitch.org> - 1.0.50-1
 - created out of the spec file for june

diff --git a/freeswitch-sounds-music.spec b/freeswitch-sounds-music.spec
index 592e8def0c18dae3e0cc215332b89bcbb41b05be..a885d2e7e1067b762b24dc781e65ae03b993477c 100644 (file)
--- a/freeswitch-sounds-music.spec
+++ b/freeswitch-sounds-music.spec
@@ -35,8 +35,8 @@
 
 Summary:       FreeSWITCH Music on Hold soundfiles
 Name:          freeswitch-sounds-music
-Version:       1.0.50
-Release:       2%{?dist}
+Version:       1.0.52
+Release:       1%{?dist}
 License:       MPL
 Group:         Productivity/Telephony/Servers
 Packager:      Joseph L. Casale <jcasale@activenetwerx.com>
@@ -153,6 +153,8 @@ FreeSWITCH 48kHz Music On Hold soundfiles
 
 
 %changelog
+* Fri Apr 19 2019 Andrey Volk <andrey@signalwire.com> - 1.0.52-1
+- bump up version
 * Sat Jul 16 2011 Joseph Casale <jcasale@activenetwerx.com> 1.0.8-2
 - Fix up for FreeSWITCH FHS and AutoBuild System
 * Sat Jul 16 2011 Joseph Casale <jcasale@activenetwerx.com> 1.0.8-1

diff --git a/freeswitch-sounds-pt-BR-karina.spec b/freeswitch-sounds-pt-BR-karina.spec
index 1260d6a65f0ffcb463895f69f5c51304786ab8c7..c0a9a6ffe04a177322572efb0269a2f8d019a551 100644 (file)
--- a/freeswitch-sounds-pt-BR-karina.spec
+++ b/freeswitch-sounds-pt-BR-karina.spec
@@ -2,7 +2,7 @@
 # Copyright and license
 ##############################################################################
 #
-# Spec file for package freeswitch-sounds-pt-BR-karina (version 1.0.50-1)
+# Spec file for package freeswitch-sounds-pt-BR-karina (version 1.0.51-1)
 #
 # Based on parts by Copyright (c) 2009 Patrick Laimbock 
 # Copyright (c) 2014 FreeSWITCH.org
@@ -14,7 +14,7 @@
 # Set variables
 ##############################################################################
 
-%define version        1.0.50
+%define version        1.0.51
 %define release        1
 
 %define fsname  freeswitch
@@ -314,5 +314,7 @@ popd
 ##############################################################################
 
 %changelog
+* Fri Apr 19 2019 Andrey Volk <andrey@signalwire.com> - 1.0.51-1
+- bump up version
 * Fri Sep 12 2014 Ken Rice <krice@freeswitch.org> - 1.0.50-1
 - created out of the spec file for june

diff --git a/freeswitch-sounds-ru-RU-elena.spec b/freeswitch-sounds-ru-RU-elena.spec
index f7192b33ce3a18c4c4701ebe40b4b7b69d03ee25..28f5f5bafe186766dcdce5ea21a7002ba9a2a77d 100644 (file)
--- a/freeswitch-sounds-ru-RU-elena.spec
+++ b/freeswitch-sounds-ru-RU-elena.spec
@@ -2,7 +2,7 @@
 # Copyright and license
 ##############################################################################
 #
-# Spec file for package freeswitch-sounds-ru-RU-elena (version 1.0.13-1)
+# Spec file for package freeswitch-sounds-ru-RU-elena (version 1.0.51-1)
 #
 # Based on parts by Copyright (c) 2009 Patrick Laimbock 
 # Copyright (c) 2011 Michal Bielicki
@@ -20,7 +20,7 @@
 # Set variables
 ##############################################################################
 
-%define version        1.0.50
+%define version        1.0.51
 %define release        1
 
 %define fsname  freeswitch
@@ -320,6 +320,8 @@ popd
 ##############################################################################
 
 %changelog
+* Fri Apr 19 2019 Andrey Volk <andrey@signalwire.com> - 1.0.51-1
+- bump up version
 * Fri Sep 12 2014 Ken Rice <krice@freeswitch.org> - 1.0.50-1
 - created out of the spec file for elena
 * Mon Mar 06 2012 Ken Rice <krice@freeswitch.org> - 1.0.13-2

diff --git a/freeswitch-sounds-sv-se-jakob.spec b/freeswitch-sounds-sv-se-jakob.spec
index 8300cc8515c0a3152c9e215ca32ca24e5ac5f575..5ddf6218c84ddca8e6c961832239fa210c8c2708 100644 (file)
--- a/freeswitch-sounds-sv-se-jakob.spec
+++ b/freeswitch-sounds-sv-se-jakob.spec
@@ -2,7 +2,7 @@
 # Copyright and license
 ##############################################################################
 #
-# Spec file for package freeswitch-sounds-sv-se-jakob (version 1.0.18-1)
+# Spec file for package freeswitch-sounds-sv-se-jakob (version 1.0.50-1)
 #
 # Copyright (c) 2009 Patrick Laimbock 
 # Copied and modified for mod_say_sv (c) 2013 Jakob Sundberg

diff --git a/scripts/ci/mk-sounds-rpms.sh b/scripts/ci/mk-sounds-rpms.sh
index aca867076b3e47509a5139674ae11795eb074277..fda715d02ae31d702fc4f5540c788b383be70187 100755 (executable)
--- a/scripts/ci/mk-sounds-rpms.sh
+++ b/scripts/ci/mk-sounds-rpms.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 ##### -*- mode:shell-script; indent-tabs-mode:nil; sh-basic-offset:2 -*-
 
-declare -a specfiles=('freeswitch-sounds-en-ca-june.spec' 'freeswitch-sounds-fr-ca-june.spec' 'freeswitch-sounds-ru-RU-elena.spec' 'freeswitch-sounds-en-us-callie.spec' 'freeswitch-sounds-sv-se-jakob.spec')
+declare -a specfiles=('freeswitch-sounds-en-ca-june.spec' 'freeswitch-sounds-en-us-allison.spec' 'freeswitch-sounds-fr-ca-june.spec' 'freeswitch-sounds-music.spec' 'freeswitch-sounds-pt-BR-karina.spec' 'freeswitch-sounds-ru-RU-elena.spec' 'freeswitch-sounds-en-us-callie.spec' 'freeswitch-sounds-sv-se-jakob.spec')
 
 sdir="."
 [ -n "${0%/*}" ] && sdir="${0%/*}"
@@ -15,17 +15,17 @@ basedir=$(pwd);
 
 if [ ! -d "$basedir/../freeswitch-sounds" ]; then
        cd $basedir/..
-       git clone https://freeswitch.org/stash/scm/fs/freeswitch-sounds.git 
+       git clone https://freeswitch.org/stash/scm/fs/freeswitch-sounds.git
 else
        cd $basedir/../freeswitch-sounds
        git clean -fdx
-        git pull
+       git pull
 fi
 
 for i in "${specfiles[@]}"
 do
 
-cd $basedir/../freeswitch-sounds/sounds/trunk
+cd $basedir/../freeswitch-sounds/
 
 ./dist.pl `echo $i|sed -e 's/freeswitch-sounds-//g' -e 's/\.spec//g' -e 's/-/\//g'`