Skip to content

Commit 2fb5a39

Browse files
andywolkandywolk
committed
FS-11567: [Build-System] CentOS packaging: Sound logic cleanup.
1 parent 19d8fc7 commit 2fb5a39

9 files changed

+42
-27
lines changed

‎freeswitch-sounds-en-ca-june.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright and license
33
##############################################################################
44
#
5-
# Spec file for package freeswitch-sounds-en-ca-june (version 1.0.50-1)
5+
# Spec file for package freeswitch-sounds-en-ca-june (version 1.0.51-1)
66
#
77
# Based on parts by Copyright (c) 2009 Patrick Laimbock
88
# Copyright (c) 2014 FreeSWITCH.org
@@ -14,7 +14,7 @@
1414
# Set variables
1515
##############################################################################
1616

17-
%define version 1.0.50
17+
%define version 1.0.51
1818
%define release 1
1919

2020
%define fsname freeswitch
@@ -314,5 +314,7 @@ popd
314314
##############################################################################
315315

316316
%changelog
317+
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.51-1
318+
- version bump
317319
* Fri Sep 12 2014 Ken Rice <[email protected]> - 1.0.50-1
318320
- created out of the spec file for june

‎freeswitch-sounds-en-us-allison.spec

+13-10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright and license
33
##############################################################################
44
#
5-
# Spec file for package freeswitch-sounds-en-us-allison (version 1.0.0-1)
5+
# Spec file for package freeswitch-sounds-en-us-allison (version 1.0.1-1)
66
#
77
# Copyright (c) 2009 Patrick Laimbock
88
# Some fixes and additions (c) 2011 Michal Bielicki
@@ -20,7 +20,7 @@
2020
# Set variables
2121
##############################################################################
2222

23-
%define version 1.0.0
23+
%define version 1.0.1
2424
%define release 1
2525

2626
%define fsname freeswitch
@@ -203,6 +203,7 @@ popd
203203

204204
%files -n freeswitch-sounds-en-us-allison-8000
205205
%defattr(-,root,root,-)
206+
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/alt/8000
206207
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/ascii/8000
207208
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/base256/8000
208209
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/conference/8000
@@ -211,10 +212,10 @@ popd
211212
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/directory/8000
212213
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/ivr/8000
213214
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/misc/8000
214-
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/phonetic-ascii/8000
215215
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/time/8000
216216
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/voicemail/8000
217217
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/zrtp/8000
218+
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/alt/8000/*.wav
218219
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/ascii/8000/*.wav
219220
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/base256/8000/*.wav
220221
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/conference/8000/*.wav
@@ -223,13 +224,13 @@ popd
223224
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/directory/8000/*.wav
224225
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/ivr/8000/*.wav
225226
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/misc/8000/*.wav
226-
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/phonetic-ascii/8000/*.wav
227227
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/time/8000/*.wav
228228
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/voicemail/8000/*.wav
229229
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/zrtp/8000/*.wav
230230

231231
%files -n freeswitch-sounds-en-us-allison-16000
232232
%defattr(-,root,root,-)
233+
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/alt/16000
233234
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/ascii/16000
234235
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/base256/16000
235236
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/conference/16000
@@ -238,10 +239,10 @@ popd
238239
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/directory/16000
239240
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/ivr/16000
240241
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/misc/16000
241-
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/phonetic-ascii/16000
242242
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/time/16000
243243
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/voicemail/16000
244244
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/zrtp/16000
245+
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/alt/16000/*.wav
245246
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/ascii/16000/*.wav
246247
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/base256/16000/*.wav
247248
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/conference/16000/*.wav
@@ -250,13 +251,13 @@ popd
250251
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/directory/16000/*.wav
251252
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/ivr/16000/*.wav
252253
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/misc/16000/*.wav
253-
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/phonetic-ascii/16000/*.wav
254254
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/time/16000/*.wav
255255
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/voicemail/16000/*.wav
256256
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/zrtp/16000/*.wav
257257

258258
%files -n freeswitch-sounds-en-us-allison-32000
259259
%defattr(-,root,root,-)
260+
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/alt/32000
260261
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/ascii/32000
261262
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/base256/32000
262263
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/conference/32000
@@ -265,10 +266,10 @@ popd
265266
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/directory/32000
266267
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/ivr/32000
267268
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/misc/32000
268-
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/phonetic-ascii/32000
269269
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/time/32000
270270
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/voicemail/32000
271271
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/zrtp/32000
272+
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/alt/32000/*.wav
272273
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/ascii/32000/*.wav
273274
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/base256/32000/*.wav
274275
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/conference/32000/*.wav
@@ -277,13 +278,13 @@ popd
277278
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/directory/32000/*.wav
278279
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/ivr/32000/*.wav
279280
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/misc/32000/*.wav
280-
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/phonetic-ascii/32000/*.wav
281281
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/time/32000/*.wav
282282
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/voicemail/32000/*.wav
283283
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/zrtp/32000/*.wav
284284

285285
%files -n freeswitch-sounds-en-us-allison-48000
286286
%defattr(-,root,root,-)
287+
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/alt/48000
287288
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/ascii/48000
288289
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/base256/48000
289290
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/conference/48000
@@ -292,10 +293,10 @@ popd
292293
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/directory/48000
293294
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/ivr/48000
294295
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/misc/48000
295-
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/phonetic-ascii/48000
296296
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/time/48000
297297
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/voicemail/48000
298298
%attr(0750,freeswitch,daemon) %dir %{SOUNDSDIR}/en/us/allison/zrtp/48000
299+
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/alt/48000/*.wav
299300
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/ascii/48000/*.wav
300301
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/base256/48000/*.wav
301302
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/conference/48000/*.wav
@@ -304,7 +305,6 @@ popd
304305
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/directory/48000/*.wav
305306
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/ivr/48000/*.wav
306307
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/misc/48000/*.wav
307-
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/phonetic-ascii/48000/*.wav
308308
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/time/48000/*.wav
309309
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/voicemail/48000/*.wav
310310
%attr(0640,freeswitch,daemon) %{SOUNDSDIR}/en/us/allison/zrtp/48000/*.wav
@@ -316,6 +316,9 @@ popd
316316
##############################################################################
317317

318318
%changelog
319+
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.1-1
320+
- add missing alt folder and remove non-existing items
321+
- bump up version
319322
* Tue Jul 25 2017 Mike Jerris <[email protected]> - 1.0.0-1
320323
- update to FHS Layout for FreeSWITCH
321324
- bump up version

‎freeswitch-sounds-en-us-callie.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright and license
33
##############################################################################
44
#
5-
# Spec file for package freeswitch-sounds-en-us-callie (version 1.0.18-1)
5+
# Spec file for package freeswitch-sounds-en-us-callie (version 1.0.52-1)
66
#
77
# Copyright (c) 2009 Patrick Laimbock
88
# Some fixes and additions (c) 2011 Michal Bielicki
@@ -20,7 +20,7 @@
2020
# Set variables
2121
##############################################################################
2222

23-
%define version 1.0.50
23+
%define version 1.0.52
2424
%define release 1
2525

2626
%define fsname freeswitch
@@ -316,6 +316,8 @@ popd
316316
##############################################################################
317317

318318
%changelog
319+
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.52-1
320+
- bump up version
319321
* Sun Mar 05 2012 Ken Rice <[email protected]> - 1.0.18-1
320322
- update to FHS Layout for FreeSWITCH
321323
- bump up version

‎freeswitch-sounds-fr-ca-june.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright and license
33
##############################################################################
44
#
5-
# Spec file for package freeswitch-sounds-fr-ca-june (version 1.0.50-1)
5+
# Spec file for package freeswitch-sounds-fr-ca-june (version 1.0.51-1)
66
#
77
# Based on parts by Copyright (c) 2009 Patrick Laimbock
88
# Copyright (c) 2014 FreeSWITCH.org
@@ -14,7 +14,7 @@
1414
# Set variables
1515
##############################################################################
1616

17-
%define version 1.0.50
17+
%define version 1.0.51
1818
%define release 1
1919

2020
%define fsname freeswitch
@@ -322,5 +322,7 @@ popd
322322
##############################################################################
323323

324324
%changelog
325+
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.51-1
326+
- bump up version
325327
* Fri Sep 12 2014 Ken Rice <[email protected]> - 1.0.50-1
326328
- created out of the spec file for june

‎freeswitch-sounds-music.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535

3636
Summary: FreeSWITCH Music on Hold soundfiles
3737
Name: freeswitch-sounds-music
38-
Version: 1.0.50
39-
Release: 2%{?dist}
38+
Version: 1.0.52
39+
Release: 1%{?dist}
4040
License: MPL
4141
Group: Productivity/Telephony/Servers
4242
Packager: Joseph L. Casale <[email protected]>
@@ -153,6 +153,8 @@ FreeSWITCH 48kHz Music On Hold soundfiles
153153

154154

155155
%changelog
156+
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.52-1
157+
- bump up version
156158
* Sat Jul 16 2011 Joseph Casale <[email protected]> 1.0.8-2
157159
- Fix up for FreeSWITCH FHS and AutoBuild System
158160
* Sat Jul 16 2011 Joseph Casale <[email protected]> 1.0.8-1

‎freeswitch-sounds-pt-BR-karina.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright and license
33
##############################################################################
44
#
5-
# Spec file for package freeswitch-sounds-pt-BR-karina (version 1.0.50-1)
5+
# Spec file for package freeswitch-sounds-pt-BR-karina (version 1.0.51-1)
66
#
77
# Based on parts by Copyright (c) 2009 Patrick Laimbock
88
# Copyright (c) 2014 FreeSWITCH.org
@@ -14,7 +14,7 @@
1414
# Set variables
1515
##############################################################################
1616

17-
%define version 1.0.50
17+
%define version 1.0.51
1818
%define release 1
1919

2020
%define fsname freeswitch
@@ -314,5 +314,7 @@ popd
314314
##############################################################################
315315

316316
%changelog
317+
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.51-1
318+
- bump up version
317319
* Fri Sep 12 2014 Ken Rice <[email protected]> - 1.0.50-1
318320
- created out of the spec file for june

‎freeswitch-sounds-ru-RU-elena.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright and license
33
##############################################################################
44
#
5-
# Spec file for package freeswitch-sounds-ru-RU-elena (version 1.0.13-1)
5+
# Spec file for package freeswitch-sounds-ru-RU-elena (version 1.0.51-1)
66
#
77
# Based on parts by Copyright (c) 2009 Patrick Laimbock
88
# Copyright (c) 2011 Michal Bielicki
@@ -20,7 +20,7 @@
2020
# Set variables
2121
##############################################################################
2222

23-
%define version 1.0.50
23+
%define version 1.0.51
2424
%define release 1
2525

2626
%define fsname freeswitch
@@ -320,6 +320,8 @@ popd
320320
##############################################################################
321321

322322
%changelog
323+
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.51-1
324+
- bump up version
323325
* Fri Sep 12 2014 Ken Rice <[email protected]> - 1.0.50-1
324326
- created out of the spec file for elena
325327
* Mon Mar 06 2012 Ken Rice <[email protected]> - 1.0.13-2

‎freeswitch-sounds-sv-se-jakob.spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright and license
33
##############################################################################
44
#
5-
# Spec file for package freeswitch-sounds-sv-se-jakob (version 1.0.18-1)
5+
# Spec file for package freeswitch-sounds-sv-se-jakob (version 1.0.50-1)
66
#
77
# Copyright (c) 2009 Patrick Laimbock
88
# Copied and modified for mod_say_sv (c) 2013 Jakob Sundberg

‎scripts/ci/mk-sounds-rpms.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
##### -*- mode:shell-script; indent-tabs-mode:nil; sh-basic-offset:2 -*-
33

4-
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')
4+
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')
55

66
sdir="."
77
[ -n "${0%/*}" ] && sdir="${0%/*}"
@@ -15,17 +15,17 @@ basedir=$(pwd);
1515

1616
if [ ! -d "$basedir/../freeswitch-sounds" ]; then
1717
cd $basedir/..
18-
git clone https://freeswitch.org/stash/scm/fs/freeswitch-sounds.git
18+
git clone https://freeswitch.org/stash/scm/fs/freeswitch-sounds.git
1919
else
2020
cd $basedir/../freeswitch-sounds
2121
git clean -fdx
22-
git pull
22+
git pull
2323
fi
2424

2525
for i in "${specfiles[@]}"
2626
do
2727

28-
cd $basedir/../freeswitch-sounds/sounds/trunk
28+
cd $basedir/../freeswitch-sounds/
2929

3030
./dist.pl `echo $i|sed -e 's/freeswitch-sounds-//g' -e 's/\.spec//g' -e 's/-/\//g'`
3131

0 commit comments

Comments
 (0)