SPECS: htpdate.spec, httptunnel.spec, icecast.spec - use %service

glen glen at pld-linux.org
Wed Mar 1 00:37:01 CET 2006 

Author: glen                         Date: Tue Feb 28 23:37:01 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   htpdate.spec (1.3 -> 1.4) , httptunnel.spec (1.23 -> 1.24) , icecast.spec (1.65 -> 1.66) 

---- Diffs:

================================================================
Index: SPECS/htpdate.spec
diff -u SPECS/htpdate.spec:1.3 SPECS/htpdate.spec:1.4
--- SPECS/htpdate.spec:1.3	Tue Feb  7 00:08:36 2006
+++ SPECS/htpdate.spec	Wed Mar  1 00:36:51 2006
@@ -11,6 +11,7 @@
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 URL:		http://www.clevervest.com/htp/
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts >= 0.4.0.10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,13 +54,13 @@
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,cron.hourly}
 
 install htpdate $RPM_BUILD_ROOT%{_sbindir}/htpdate
-gzip -dc htpdate.8.gz >$RPM_BUILD_ROOT%{_mandir}/man8/htpdate.8
+gzip -dc htpdate.8.gz > $RPM_BUILD_ROOT%{_mandir}/man8/htpdate.8
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/htpdate
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/htpdate
 
-cat > $RPM_BUILD_ROOT/etc/cron.hourly/htpdate <<EOF
+cat > $RPM_BUILD_ROOT/etc/cron.hourly/htpdate <<'EOF'
 #!/bin/sh
-/etc/rc.d/init.d/htpdate cronsettime
+exec /sbin/service htpdate cronsettime
 EOF
 
 %clean
@@ -67,18 +68,12 @@
 
 %post
 /sbin/chkconfig --add htpdate
-if [ -f /var/lock/subsys/htpdate ]; then
-	/etc/rc.d/init.d/htpdate restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/htpdate start\" to start htpdate."
-fi
+%service htpdate restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/htpdate ]; then
-		/etc/rc.d/init.d/htpdate stop >&2
-	fi
-		/sbin/chkconfig --del htpdate
+	%service htpdate stop
+	/sbin/chkconfig --del htpdate
 fi
 
 %files
@@ -96,6 +91,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/02/28 23:36:51  glen
+- use %service
+
 Revision 1.3  2006/02/06 23:08:36  maciek2w
 - updated to 0.9.1
 - STBR

================================================================
Index: SPECS/httptunnel.spec
diff -u SPECS/httptunnel.spec:1.23 SPECS/httptunnel.spec:1.24
--- SPECS/httptunnel.spec:1.23	Thu Jan 12 18:33:55 2006
+++ SPECS/httptunnel.spec	Wed Mar  1 00:36:51 2006
@@ -17,6 +17,7 @@
 URL:		http://www.nocrew.org/software/httptunnel.html
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -117,18 +118,11 @@
 
 %post server
 /sbin/chkconfig --add httptunnel
-if [ -r /var/lock/subsys/httptunnel ]; then
-	/etc/rc.d/init.d/httptunnel restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/httptunnel start\" to start HTTP tunnel daemons."
-fi
-
+%service httptunnel restart "HTTP tunnel daemons"
 
 %preun server
 if [ "$1" = "0" ]; then
-	if [ -r /var/lock/subsys/httptunnel ]; then
-		/etc/rc.d/init.d/httptunnel stop >&2
-	fi
+	%service httptunnel stop
 	/sbin/chkconfig --del httptunnel
 fi
 
@@ -154,6 +148,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/02/28 23:36:51  glen
+- use %service
+
 Revision 1.23  2006/01/12 17:33:55  darekr
 - strict deps
 
@@ -170,7 +167,7 @@
 - cosmetics: spaces -> tabs
 
 Revision 1.18  2003/08/22 15:16:10  ankry
-- fix improper use of %%{_sysconfdir}
+- fix improper use of %{_sysconfdir}
 - fix attributes
 
 Revision 1.17  2003/07/29 14:17:59  qboosh
@@ -187,21 +184,21 @@
 - Added init script for server.
 - Added config file for server.
 - Splitted into "client" and "server" subpackages.
-TODO: config file and rc.script for client.
+  TODO: config file and rc.script for client.
 
 Revision 1.13  2002/11/27 21:10:38  juandon
-- new %%doc
+- new %doc
 
 Revision 1.12  2002/10/09 13:14:33  kloczek
 - use more macros, some cosmetics, added missing "rm -f missing" and use new %doc
 
 Revision 1.11  2002/05/21 23:13:34  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.10  2002/04/25 16:34:32  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.9  2002/03/24 23:28:19  kloczek
 - perl -pi -e "s/^automake -a -c$/automake -a -c -f/"
@@ -211,7 +208,7 @@
   Group field using gettext).
 
 Revision 1.7  2002/01/18 02:13:17  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.6  2001/11/29 15:44:26  qboosh
 - pl translations

================================================================
Index: SPECS/icecast.spec
diff -u SPECS/icecast.spec:1.65 SPECS/icecast.spec:1.66
--- SPECS/icecast.spec:1.65	Sat Dec  3 20:01:45 2005
+++ SPECS/icecast.spec	Wed Mar  1 00:36:51 2006
@@ -18,23 +18,23 @@
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
 BuildRequires:	curl-devel >= 7.10.0
-BuildRequires:	libxml2-devel
-BuildRequires:	libxslt-devel
 BuildRequires:	libogg-devel >= 2:1.0
 BuildRequires:	libtheora-devel
 BuildRequires:	libtool
 BuildRequires:	libvorbis-devel >= 1:1.0
+BuildRequires:	libxml2-devel
+BuildRequires:	libxslt-devel
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	speex-devel
-PreReq:		rc-scripts
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
-Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 Provides:	group(icecast)
 Provides:	user(icecast)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,27 +42,26 @@
 %define		_sysconfdir	/etc/%{name}
 
 %description
-Icecast2 is an Internet based broadcasting system based on the Mpeg
+Icecast is an Internet based broadcasting system based on the Mpeg
 Layer III streaming technology. It was originally inspired by
 Nullsoft's Shoutcast and also mp3serv by Scott Manley. The icecast
 project was started for several reasons: a) all broadcasting systems
 were pretty much closed source, non-free software implementations, b)
 Shoutcast doesn't allow you to run your own directory servers, or
-support them, and c) we thought it would be a lot of fun. Unstable
-version.
+support them, and c) we thought it would be a lot of fun.
 
 %description -l es
-Icecast2 es un sistema de Transmisión (broadcast) en Internet que
+Icecast es un sistema de Transmisión (broadcast) en Internet que
 utiliza la tecnología MP3.
 
 %description -l pl
-Icecast2 to internetowy serwer rozsyłający strumienie MPEG Layer III.
+Icecast to internetowy serwer rozsyłający strumienie MPEG Layer III.
 Oryginalnie zainspirowany przez Shoutcast firmy Nullsoft oraz program
 mp3serv autorstwa Scotta Manleya. Projekt icecast2 został rozpoczęty z
 kilku powodów: a) wszystkie systemy broadcastowe były ładnymi,
 zamkniętymi programami, non-free, b) Shoutcast nie pozwala na
 wystartowanie swoich własnych directory servers czy wspierać ich, c)
-to niezła zabawa. Uwaga - to ciągle wersja unstable.
+to niezła zabawa.
 
 %description -l pt_BR
 O Icecast é um sistema de broadcast na Internet que utiliza a
@@ -98,18 +97,12 @@
 %useradd -u 57 -r -d /dev/null -s /bin/false -c "Streamcast" -g icecast icecast
 
 %post
-chkconfig --add icecast
-if [ -f /var/lock/subsys/icecast ]; then
-	/etc/rc.d/init.d/icecast restart >&2
-else
-	echo "Run '/etc/rc.d/init.d/icecast start' to start icecast deamon." >&2
-fi
+/sbin/chkconfig --add icecast
+%service icecast restart "icecast deamon"
 
 %preun
 if [ "$1" = "0" ] ; then
-	if [ -f /var/lock/subsys/icecast ]; then
-		/etc/rc.d/init.d/icecast stop >&2
-	fi
+	%service icecast stop
 	/sbin/chkconfig --del icecast >&2
 fi
 
@@ -135,6 +128,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2006/02/28 23:36:51  glen
+- use %service
+
 Revision 1.65  2005/12/03 19:01:45  qboosh
 - updated to 2.3.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/htpdate.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/httptunnel.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/SPECS/icecast.spec?r1=1.65&r2=1.66&f=u

More information about the pld-cvs-commit mailing list