SPECS: alarmwatch.spec, alsa-utils.spec, am-utils.spec - use %service

glen glen at pld-linux.org
Thu Mar 23 20:37:43 CET 2006 

Author: glen                         Date: Thu Mar 23 19:37:43 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   alarmwatch.spec (1.9 -> 1.10) , alsa-utils.spec (1.129 -> 1.130) , am-utils.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: SPECS/alarmwatch.spec
diff -u SPECS/alarmwatch.spec:1.9 SPECS/alarmwatch.spec:1.10
--- SPECS/alarmwatch.spec:1.9	Mon Dec 12 14:44:44 2005
+++ SPECS/alarmwatch.spec	Thu Mar 23 20:37:37 2006
@@ -12,9 +12,10 @@
 Source2:	%{name}.sysconfig
 URL:		http://www.azstarnet.com/~donut/programs/alarmwatch.html
 BuildRequires:	autoconf
-Requires:	rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	lm_sensors
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -33,7 +34,6 @@
 %build
 %{__autoconf}
 %configure
-
 %{__make}
 
 %install
@@ -53,18 +53,14 @@
 
 %post
 /sbin/chkconfig --add alarmwatch
-if [ -f /var/lock/subsys/alarmwatch ]; then
-	/etc/rc.d/init.d/gpm alarmwatch >&2
-else
-	echo "Run \"/etc/rc.d/init.d/alarmwatch start\" to start alarmwatch daemon."
+%service alarmwatch restart "alarmwatch daemon"
+if [ "$1" = 1 ]; then
 	echo "Remember to configure it first!"
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/alarmwatch ]; then
-		/etc/rc.d/init.d/alarmwatch stop >&2
-	fi
+	%service alarmwatch stop
 	/sbin/chkconfig --del alarmwatch
 fi
 
@@ -82,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/03/23 19:37:37  glen
+- use %service
+
 Revision 1.9  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 
@@ -98,12 +97,12 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.4  2002/10/10 11:28:40  marcus
-- use new %%doc
+- use new %doc
 
 Revision 1.3  2002/05/21 23:12:40  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.2  2002/05/15 19:45:17  kloczek
 - cosmetics.

================================================================
Index: SPECS/alsa-utils.spec
diff -u SPECS/alsa-utils.spec:1.129 SPECS/alsa-utils.spec:1.130
--- SPECS/alsa-utils.spec:1.129	Sat Nov 19 16:40:14 2005
+++ SPECS/alsa-utils.spec	Thu Mar 23 20:37:37 2006
@@ -23,6 +23,7 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	awk
 Requires:	dialog
 Requires:	diffutils
@@ -32,10 +33,11 @@
 
 %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
@@ -44,33 +46,32 @@
 %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
@@ -119,17 +120,11 @@
 
 %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
 
@@ -168,6 +163,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.130  2006/03/23 19:37:37  glen
+- use %service
+
 Revision 1.129  2005/11/19 15:40:14  qboosh
 - updated to final 1.0.10
 

================================================================
Index: SPECS/am-utils.spec
diff -u SPECS/am-utils.spec:1.39 SPECS/am-utils.spec:1.40
--- SPECS/am-utils.spec:1.39	Mon Dec 12 14:44:44 2005
+++ SPECS/am-utils.spec	Thu Mar 23 20:37:37 2006
@@ -18,10 +18,12 @@
 Patch1:		%{name}-6.0a16-alpha.patch
 URL:		http://www.am-utils.org/
 BuildRequires:	autoconf
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,postun):	/sbin/ldconfig
 Requires:	/sbin/chkconfig
 Requires:	portmap
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	amd
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Am-utils includes an updated version of Amd, the popular BSD
@@ -104,17 +106,11 @@
 /sbin/ldconfig
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 /sbin/chkconfig --add amd
-if [ -f /var/lock/subsys/drbd ]; then
-	/etc/rc.d/init.d/amd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/amd start\" to start amd service." >&2
-fi
+%service amd restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/amd ]; then
-		/etc/rc.d/init.d/amd stop
-	fi
+	%service amd stop
 	/sbin/chkconfig --del amd
 fi
 
@@ -141,6 +137,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2006/03/23 19:37:37  glen
+- use %service
+
 Revision 1.39  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/alarmwatch.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/alsa-utils.spec?r1=1.129&r2=1.130&f=u
    http://cvs.pld-linux.org/SPECS/am-utils.spec?r1=1.39&r2=1.40&f=u

More information about the pld-cvs-commit mailing list