- use %service

Changed files:
    alsa-utils.spec -> 1.130

diff --git a/alsa-utils.spec b/alsa-utils.spec
index b65e4d3913b859facd5f1db6d31db3140a546275..4fb526d52c25cae359217ffcc8095afe321510b5 100644 (file)
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -22,6 +22,7 @@ BuildRequires:        gettext-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: ncurses-devel
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      awk
 Requires:      dialog
 Requires:      diffutils
@@ -31,10 +32,11 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 This packages contains command line utilities for the ALSA project:
-- alsactl      - utility for store / restore of soundcard settings
-- aplay/arecord        - utility for playback / record of .wav, .voc, .au files
-- amixer       - a command line mixer
-- alsamixer    - ncurses mixer
+- alsactl - utility for store / restore of soundcard settings
+- aplay/arecord - utility for playback / record of .wav, .voc, .au
+  files
+- amixer - a command line mixer
+- alsamixer - ncurses mixer
 
 %description -l es
 Utilitarios para el sistema ALSA, la arquitetura avanzada de sonido
@@ -43,33 +45,32 @@ para Linux.
 %description -l pl
 Pakiet zawiera nastêpuj±ce, dzia³aj±ce z linii poleceñ, narzêdzia dla
 projektu ALSA (Advanced Linux Sound Architecture):
-- alsactl      - narzêdzie do zapamiêtywania / przywracania ustawieñ
-                 karty d¼wiêkowej
-- aplay/arecord        - narzêdzia do odtwarzania / nagrywania plików .wav,
-                 .voc, .au
-- amixer       - mikser dzia³aj±cy z linii poleceñ
-- alsamixer    - mikser z interfejsem opartym o ncurses
+- alsactl - narzêdzie do zapamiêtywania / przywracania ustawieñ karty
+  d¼wiêkowej
+- aplay/arecord - narzêdzia do odtwarzania / nagrywania plików .wav,
+  .voc, .au
+- amixer - mikser dzia³aj±cy z linii poleceñ
+- alsamixer - mikser z interfejsem opartym o ncurses
 
 %description -l pt_BR
 Utilitários para o ALSA, a arquitetura de som avançada para o Linux.
 
 %description -l ru
 üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÕÔÉÌÉÔÙ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ ÄÌÑ ALSA project:
-- alsactl      - ÕÔÉÌÉÔÁ ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ/×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÎÁÓÔÒÏÅË
-                 Ú×ÕËÏ×ÏÊ ËÁÒÔÙ
-- aplay/arecord        - ÕÔÉÌÉÔÁ ÄÌÑ ÚÁÐÉÓÉ/ÐÒÏÉÇÒÙ×ÁÎÉÑ ÆÁÊÌÏ× .wav, .voc,
-                 .au
-- amixer       - ÍÉËÛÅÒ, ÕÐÒÁ×ÌÑÅÍÙÊ ÉÚ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ
-- alsamixer    - ÍÉËÛÅÒ Ó ÉÎÔÅÒÆÅÊÓÏÍ ncurses
+- alsactl - ÕÔÉÌÉÔÁ ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ/×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÎÁÓÔÒÏÅË Ú×ÕËÏ×ÏÊ
+  ËÁÒÔÙ
+- aplay/arecord - ÕÔÉÌÉÔÁ ÄÌÑ ÚÁÐÉÓÉ/ÐÒÏÉÇÒÙ×ÁÎÉÑ ÆÁÊÌÏ× .wav, .voc,
+  .au
+- amixer - ÍÉËÛÅÒ, ÕÐÒÁ×ÌÑÅÍÙÊ ÉÚ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ
+- alsamixer - ÍÉËÛÅÒ Ó ÉÎÔÅÒÆÅÊÓÏÍ ncurses
 
 %description -l uk
 ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÕÔÉ̦ÔÉ ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÁ ÄÌÑ ALSA project:
-- alsactl      - ÕÔÉ̦ÔÁ ÄÌÑ ÚÂÅÒÅÖÅÎÎÑ/צÄÎÏ×ÌÅÎÎÑ ÎÁÓÔÁÎÏ×
-                 Ú×ÕËÏ×ϧ ËÁÒÔÉ
-- aplay/arecord        - ÕÔÉ̦ÔÁ ÄÌÑ ÚÁÐÉÓÕ/ÐÒÏÇÒÁ×ÁÎÎÑ ÆÁÊÌ¦× .wav, .voc,
-                 .au
-- amixer       - ͦËÛÅÒ, ÑËÉÊ ËÅÒÕ¤ÔØÓÑ Ú ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÁ
-- alsamixer    - ͦËÛÅÒ Ú ¦ÎÔÅÒÆÅÊÓÏÍ ncurses
+- alsactl - ÕÔÉ̦ÔÁ ÄÌÑ ÚÂÅÒÅÖÅÎÎÑ/צÄÎÏ×ÌÅÎÎÑ ÎÁÓÔÁÎÏ× Ú×ÕËÏ×ϧ ËÁÒÔÉ
+- aplay/arecord - ÕÔÉ̦ÔÁ ÄÌÑ ÚÁÐÉÓÕ/ÐÒÏÇÒÁ×ÁÎÎÑ ÆÁÊÌ¦× .wav, .voc,
+  .au
+- amixer - ͦËÛÅÒ, ÑËÉÊ ËÅÒÕ¤ÔØÓÑ Ú ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÁ
+- alsamixer - ͦËÛÅÒ Ú ¦ÎÔÅÒÆÅÊÓÏÍ ncurses
 
 %package init
 Summary:       Init script for Advanced Linux Sound Architecture
@@ -118,17 +119,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post init
 /sbin/chkconfig --add alsasound
-if [ -f /var/lock/subsys/alsasound ]; then
-       /etc/rc.d/init.d/alsasound restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/alsasound start\" to start ALSA %{version} services."
-fi
+%service alsasound restart "ALSA %{version} services"
 
 %preun init
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/alsasound ]; then
-               /etc/rc.d/init.d/alsasound stop >&2
-       fi
+       %service alsasound stop
        /sbin/chkconfig --del alsasound
 fi