From 62fdc92e214b0551b2a0b903f84eed30c2dfcfc6740bb7f7453e382c0806f20e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 25 Aug 2018 07:47:06 +0000 Subject: [PATCH 1/4] - Fix %asterisk_snd_* definition to work with the newer rpm macro expander. OBS-URL: https://build.opensuse.org/package/show/network:telephony/asterisk-sounds-devel?expand=0&rev=13 --- asterisk-sounds-devel.changes | 6 ++++++ asterisk-sounds-devel.spec | 7 +++---- macros.asterisk-sounds | 18 +++++++++--------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/asterisk-sounds-devel.changes b/asterisk-sounds-devel.changes index da7b0aa..74bfc5b 100644 --- a/asterisk-sounds-devel.changes +++ b/asterisk-sounds-devel.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Aug 25 07:46:10 UTC 2018 - jengelh@inai.de + +- Fix %asterisk_snd_* definition to work with the newer rpm + macro expander. + ------------------------------------------------------------------- Fri Jan 22 19:34:34 UTC 2016 - jengelh@inai.de diff --git a/asterisk-sounds-devel.spec b/asterisk-sounds-devel.spec index 37645bc..015f254 100644 --- a/asterisk-sounds-devel.spec +++ b/asterisk-sounds-devel.spec @@ -1,7 +1,7 @@ # # spec file for package asterisk-sounds-devel # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,13 +36,12 @@ sound packages. %build %install -c="%buildroot/%_sysconfdir/rpm" +c="%buildroot/usr/lib/rpm/macros.d/" mkdir -p "$c" install -pm0644 "%{S:1}" "$c/" %files %defattr(-,root,root) -%dir %_sysconfdir/rpm -%config %_sysconfdir/rpm/macros.* +/usr/lib/rpm/macros.d/ %changelog diff --git a/macros.asterisk-sounds b/macros.asterisk-sounds index ec1ce69..54f9205 100644 --- a/macros.asterisk-sounds +++ b/macros.asterisk-sounds @@ -26,15 +26,15 @@ This package contains the core part of that collection in \ %%defattr(-,root,root) \ } -%asterisk_snd_alaw(l:L:) %{expand:%%asterisk_snd_generic %{-l*} %{-L*} -f alaw -F 8 kHz A-law} -%asterisk_snd_g722(l:L:) %{expand:%%asterisk_snd_generic %{-l*} %{-L*} -f g722 -F G.722} -%asterisk_snd_g729(l:L:) %{expand:%%asterisk_snd_generic %{-l*} %{-L*} -f g729 -F G.729} -%asterisk_snd_gsm(l:L:) %{expand:%%asterisk_snd_generic %{-l*} %{-L*} -f gsm -F GSM} -%asterisk_snd_siren7(l:L:) %{expand:%%asterisk_snd_generic %{-l*} %{-L*} -f siren7 -F Siren7} -%asterisk_snd_siren14(l:L:) %{expand:%%asterisk_snd_generic %{-l*} %{-L*} -f siren14 -F Siren14} -%asterisk_snd_sln16(l:L:) %{expand:%%asterisk_snd_generic %{-l*} %{-L*} -f sln16 -F 16 kHz LPCM} -%asterisk_snd_ulaw(l:L:) %{expand:%%asterisk_snd_generic %{-l*} %{-L*} -f ulaw -F 8 kHz µ-law} -%asterisk_snd_wav(l:L:) %{expand:%%asterisk_snd_generic %{-l*} %{-L*} -f wav -F 8 kHz LPCM} +%asterisk_snd_alaw(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f alaw -F 8 kHz A-law} +%asterisk_snd_g722(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f g722 -F G.722} +%asterisk_snd_g729(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f g729 -F G.729} +%asterisk_snd_gsm(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f gsm -F GSM} +%asterisk_snd_siren7(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f siren7 -F Siren7} +%asterisk_snd_siren14(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f siren14 -F Siren14} +%asterisk_snd_sln16(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f sln16 -F 16 kHz LPCM} +%asterisk_snd_ulaw(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f ulaw -F 8 kHz µ-law} +%asterisk_snd_wav(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f wav -F 8 kHz LPCM} %asterisk_lng_en(f:) %{expand:%%asterisk_snd_%{-f*} -l en -L English (US)} %asterisk_lng_en_AU(f:) %{expand:%%asterisk_snd_%{-f*} -l en_AU -L English (Australian)} From 910fe8f1255bd947e9c5ec20c9c0123d3d5396cef2e278b1dd9459a56a5d3449 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 25 Aug 2018 07:49:46 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/network:telephony/asterisk-sounds-devel?expand=0&rev=14 --- macros.asterisk-sounds | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/macros.asterisk-sounds b/macros.asterisk-sounds index 54f9205..55588b5 100644 --- a/macros.asterisk-sounds +++ b/macros.asterisk-sounds @@ -26,15 +26,15 @@ This package contains the core part of that collection in \ %%defattr(-,root,root) \ } -%asterisk_snd_alaw(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f alaw -F 8 kHz A-law} -%asterisk_snd_g722(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f g722 -F G.722} -%asterisk_snd_g729(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f g729 -F G.729} -%asterisk_snd_gsm(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f gsm -F GSM} -%asterisk_snd_siren7(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f siren7 -F Siren7} -%asterisk_snd_siren14(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f siren14 -F Siren14} -%asterisk_snd_sln16(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f sln16 -F 16 kHz LPCM} -%asterisk_snd_ulaw(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f ulaw -F 8 kHz µ-law} -%asterisk_snd_wav(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l%{-l*}} %{-L:-L%{-L*}} -f wav -F 8 kHz LPCM} +%asterisk_snd_alaw(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l %{-l*}} %{-L:-L %{-L*}} -f alaw -F 8 kHz A-law} +%asterisk_snd_g722(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l %{-l*}} %{-L:-L %{-L*}} -f g722 -F G.722} +%asterisk_snd_g729(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l %{-l*}} %{-L:-L %{-L*}} -f g729 -F G.729} +%asterisk_snd_gsm(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l %{-l*}} %{-L:-L %{-L*}} -f gsm -F GSM} +%asterisk_snd_siren7(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l %{-l*}} %{-L:-L %{-L*}} -f siren7 -F Siren7} +%asterisk_snd_siren14(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l %{-l*}} %{-L:-L %{-L*}} -f siren14 -F Siren14} +%asterisk_snd_sln16(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l %{-l*}} %{-L:-L %{-L*}} -f sln16 -F 16 kHz LPCM} +%asterisk_snd_ulaw(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l %{-l*}} %{-L:-L %{-L*}} -f ulaw -F 8 kHz µ-law} +%asterisk_snd_wav(l:L:) %{expand:%%asterisk_snd_generic %{-l:-l %{-l*}} %{-L:-L %{-L*}} -f wav -F 8 kHz LPCM} %asterisk_lng_en(f:) %{expand:%%asterisk_snd_%{-f*} -l en -L English (US)} %asterisk_lng_en_AU(f:) %{expand:%%asterisk_snd_%{-f*} -l en_AU -L English (Australian)} From c407c23165fcc3f5bf2cada08947873d8314946dd9c22fb10eafbc5d6323b293 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 25 Aug 2018 10:25:28 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/network:telephony/asterisk-sounds-devel?expand=0&rev=15 --- asterisk-sounds-devel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asterisk-sounds-devel.spec b/asterisk-sounds-devel.spec index 015f254..ce89245 100644 --- a/asterisk-sounds-devel.spec +++ b/asterisk-sounds-devel.spec @@ -17,7 +17,7 @@ Name: asterisk-sounds-devel -Version: 2 +Version: 3 Release: 0 Summary: Build helpers for Asterisk sound packages License: SUSE-Public-Domain From 32dcdcbed1675aed842d0f72ad8b273c1ecc3656c9e7845ef22c9b63417ad28a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 27 Aug 2018 13:48:30 +0000 Subject: [PATCH 4/4] add en_NZ OBS-URL: https://build.opensuse.org/package/show/network:telephony/asterisk-sounds-devel?expand=0&rev=16 --- macros.asterisk-sounds | 1 + 1 file changed, 1 insertion(+) diff --git a/macros.asterisk-sounds b/macros.asterisk-sounds index 55588b5..f34ee6c 100644 --- a/macros.asterisk-sounds +++ b/macros.asterisk-sounds @@ -39,6 +39,7 @@ This package contains the core part of that collection in \ %asterisk_lng_en(f:) %{expand:%%asterisk_snd_%{-f*} -l en -L English (US)} %asterisk_lng_en_AU(f:) %{expand:%%asterisk_snd_%{-f*} -l en_AU -L English (Australian)} %asterisk_lng_en_GB(f:) %{expand:%%asterisk_snd_%{-f*} -l en_GB -L English (British)} +%asterisk_lng_en_NZ(f:) %{expand:%%asterisk_snd_%{-f*} -l en_NZ -L English (New Zealand)} %asterisk_lng_es(f:) %{expand:%%asterisk_snd_%{-f*} -l es -L Spanish} %asterisk_lng_fr(f:) %{expand:%%asterisk_snd_%{-f*} -l fr -L French} %asterisk_lng_it(f:) %{expand:%%asterisk_snd_%{-f*} -l it -L Italian}