- use %service

Changed files:
    TiMidity++.spec -> 1.81

diff --git a/TiMidity++.spec b/TiMidity++.spec
index f98a2be73b4afd0a1de4c55c75458a1ec9f61fe2..99c7a23de58b882f42461a1f191e205445e2d280 100644 (file)
--- a/TiMidity++.spec
+++ b/TiMidity++.spec
@@ -17,7 +17,6 @@ Name:         TiMidity++
 Version:       2.13.2
 Release:       2
 License:       GPL
-Vendor:                Masanao Izumo <mo@goice.co.jp>
 Group:         Applications/Sound
 Source0:       http://dl.sourceforge.net/timidity/%{name}-%{version}.tar.bz2
 # Source0-md5: a82ceeb2245e22f4de2b41da21eaee32
@@ -43,6 +42,7 @@ BuildRequires:        autoconf
 %{?with_X:BuildRequires:       motif-devel}
 %{?with_nas:BuildRequires:     nas-devel}
 BuildRequires: ncurses-devel
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: slang-devel >= 2.0.0
 %{?with_X:BuildRequires:       tk-devel >= 8.3.2}
 %{?with_X:Provides:    %{name}(X) = %{version}-%{release}}
@@ -81,16 +81,15 @@ exemplo).
 %description -l ru
 ðÒÏÉÇÒÙ×ÁÔÅÌØ MIDI ÆÁÊÌÏ×, ÎÅ ÔÒÅÂÕÀÝÉÊ ÐÏÄÄÅÒÖËÉ ÉÎÓÔÒÕÍÅÎÔÏ× MIDI
 Ú×ÕËÏ×ÏÊ ÐÌÁÔÏÊ. éÓÐÏÌØÚÕÅÔ ÆÁÊÌÙ ÉÎÓÔÒÕÍÅÎÔÏ× × ÆÏÒÍÁÔÅ GUS/patch,
-ÍÏÖÅÔ ÔÁËÖÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÁÎÎÙÅ × ÆÏÒÍÁÔÅ SoundFont.
-ïÂÅÓÐÅÞÉ×ÁÅÔ ÏÔÌÉÞÎÏÅ ËÁÞÅÓÔ×Ï Ú×ÕËÁ MIDI ÚÁ ÓÞÅÔ ÉÎÔÅÎÓÉ×ÎÏÇÏ
-ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÐÒÏÃÅÓÓÏÒÁ.
+ÍÏÖÅÔ ÔÁËÖÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÁÎÎÙÅ × ÆÏÒÍÁÔÅ SoundFont. ïÂÅÓÐÅÞÉ×ÁÅÔ
+ÏÔÌÉÞÎÏÅ ËÁÞÅÓÔ×Ï Ú×ÕËÁ MIDI ÚÁ ÓÞÅÔ ÉÎÔÅÎÓÉ×ÎÏÇÏ ÉÓÐÏÌØÚÏ×ÁÎÉÑ
+ÐÒÏÃÅÓÓÏÒÁ.
 
 %description -l uk
 ðÒÏÇÒÁ×ÁÞ MIDI ÆÁÊ̦×, ÑËÏÍÕ ÎÅ ÐÏÔÒ¦ÂÎÁ ЦÄÔÒÉÍËÁ ¦ÎÓÔÒÕÍÅÎÔ¦× MIDI
 Ú×ÕËÏ×ÏÀ ÐÌÁÔÏÀ. ÷ÉËÏÒÉÓÔÏ×Õ¤ ÆÁÊÌÉ ¦ÎÓÔÒÕÍÅÎÔ¦× Õ ÆÏÒÍÁÔ¦ GUS/patch,
-ÒÏÚÕͦ¤ ÔÁËÏÖ ÆÏÒÍÁÔ SoundFont.
-úÁÂÅÚÐÅÞÕ¤ צÄͦÎÎÕ Ñ˦ÓÔØ Ú×ÕËÕ MIDI ÚÁ ÒÁÈÕÎÏË ¦ÎÔÅÎÓÉ×ÎÏÇÏ
-×ÉËÏÒÉÓÔÁÎÎÑ ÐÒÏÃÅÓÏÒÁ.
+ÒÏÚÕͦ¤ ÔÁËÏÖ ÆÏÒÍÁÔ SoundFont. úÁÂÅÚÐÅÞÕ¤ צÄͦÎÎÕ Ñ˦ÓÔØ Ú×ÕËÕ MIDI
+ÚÁ ÒÁÈÕÎÏË ¦ÎÔÅÎÓÉ×ÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÐÒÏÃÅÓÏÒÁ.
 
 %package gspdir
 Summary:       Directory for TiMidity++ instruments
@@ -300,23 +299,15 @@ install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/timidity
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with alsa}
 %post alsaseq
 /sbin/chkconfig --add timidity
-if [ -r /var/lock/subsys/timidity ]; then
-       /etc/rc.d/init.d/timidity restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/timidity start\" to start TiMidity++ ALSA sequencer interface."
-fi
+%service timidity restart "TiMidity++ ALSA sequencer interface"
 
 %preun alsaseq
 if [ "$1" = "0" ]; then
-       if [ -r /var/lock/subsys/timidity ]; then
-               /etc/rc.d/init.d/timidity stop >&2
-       fi
+       %service timidity stop
        /sbin/chkconfig --del timidity
 fi
-%endif
 
 %files
 %defattr(644,root,root,755)