Skip to content

Commit

Permalink
FS-11567: [Build-System] CentOS packaging: Sound logic cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
@andywolk
andywolk committed May 23, 2019
1 parent 19d8fc7 commit 2fb5a39
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 27 deletions.
6 changes: 4 additions & 2 deletions freeswitch-sounds-en-ca-june.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,7 +14,7 @@
# Set variables
##############################################################################

%define version 1.0.50
%define version 1.0.51
%define release 1

%define fsname freeswitch
Expand Down Expand Up @@ -314,5 +314,7 @@ popd
##############################################################################

%changelog
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.51-1
- version bump
* Fri Sep 12 2014 Ken Rice <[email protected]> - 1.0.50-1
- created out of the spec file for june
23 changes: 13 additions & 10 deletions freeswitch-sounds-en-us-allison.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -20,7 +20,7 @@
# Set variables
##############################################################################

%define version 1.0.0
%define version 1.0.1
%define release 1

%define fsname freeswitch
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -316,6 +316,9 @@ popd
##############################################################################

%changelog
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.1-1
- add missing alt folder and remove non-existing items
- bump up version
* Tue Jul 25 2017 Mike Jerris <[email protected]> - 1.0.0-1
- update to FHS Layout for FreeSWITCH
- bump up version
Expand Down
6 changes: 4 additions & 2 deletions freeswitch-sounds-en-us-callie.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -20,7 +20,7 @@
# Set variables
##############################################################################

%define version 1.0.50
%define version 1.0.52
%define release 1

%define fsname freeswitch
Expand Down Expand Up @@ -316,6 +316,8 @@ popd
##############################################################################

%changelog
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.52-1
- bump up version
* Sun Mar 05 2012 Ken Rice <[email protected]> - 1.0.18-1
- update to FHS Layout for FreeSWITCH
- bump up version
Expand Down
6 changes: 4 additions & 2 deletions freeswitch-sounds-fr-ca-june.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,7 +14,7 @@
# Set variables
##############################################################################

%define version 1.0.50
%define version 1.0.51
%define release 1

%define fsname freeswitch
Expand Down Expand Up @@ -322,5 +322,7 @@ popd
##############################################################################

%changelog
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.51-1
- bump up version
* Fri Sep 12 2014 Ken Rice <[email protected]> - 1.0.50-1
- created out of the spec file for june
6 changes: 4 additions & 2 deletions freeswitch-sounds-music.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
Expand Down Expand Up @@ -153,6 +153,8 @@ FreeSWITCH 48kHz Music On Hold soundfiles


%changelog
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.52-1
- bump up version
* Sat Jul 16 2011 Joseph Casale <[email protected]> 1.0.8-2
- Fix up for FreeSWITCH FHS and AutoBuild System
* Sat Jul 16 2011 Joseph Casale <[email protected]> 1.0.8-1
Expand Down
6 changes: 4 additions & 2 deletions freeswitch-sounds-pt-BR-karina.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,7 +14,7 @@
# Set variables
##############################################################################

%define version 1.0.50
%define version 1.0.51
%define release 1

%define fsname freeswitch
Expand Down Expand Up @@ -314,5 +314,7 @@ popd
##############################################################################

%changelog
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.51-1
- bump up version
* Fri Sep 12 2014 Ken Rice <[email protected]> - 1.0.50-1
- created out of the spec file for june
6 changes: 4 additions & 2 deletions freeswitch-sounds-ru-RU-elena.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -20,7 +20,7 @@
# Set variables
##############################################################################

%define version 1.0.50
%define version 1.0.51
%define release 1

%define fsname freeswitch
Expand Down Expand Up @@ -320,6 +320,8 @@ popd
##############################################################################

%changelog
* Fri Apr 19 2019 Andrey Volk <[email protected]> - 1.0.51-1
- bump up version
* Fri Sep 12 2014 Ken Rice <[email protected]> - 1.0.50-1
- created out of the spec file for elena
* Mon Mar 06 2012 Ken Rice <[email protected]> - 1.0.13-2
Expand Down
2 changes: 1 addition & 1 deletion freeswitch-sounds-sv-se-jakob.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions scripts/ci/mk-sounds-rpms.sh
View file
Original file line number Diff line number Diff line change
@@ -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%/*}"
Expand All @@ -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'`

Expand Down

0 comments on commit 2fb5a39

Please sign in to comment.