SPECS: radvd.spec, rarpd.spec, rc-inetd.spec, rlinetd.spec, routed...
glen
glen at pld-linux.org
Mon Mar 13 23:13:36 CET 2006
Author: glen Date: Mon Mar 13 22:13:36 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %service
---- Files affected:
SPECS:
radvd.spec (1.40 -> 1.41) , rarpd.spec (1.11 -> 1.12) , rc-inetd.spec (1.44 -> 1.45) , rlinetd.spec (1.68 -> 1.69) , routed.spec (1.30 -> 1.31) , rp-pppoe.spec (1.24 -> 1.25) , rpld.spec (1.16 -> 1.17) , rusers.spec (1.38 -> 1.39) , rwall.spec (1.32 -> 1.33) , rwho.spec (1.30 -> 1.31)
---- Diffs:
================================================================
Index: SPECS/radvd.spec
diff -u SPECS/radvd.spec:1.40 SPECS/radvd.spec:1.41
--- SPECS/radvd.spec:1.40 Tue Dec 13 16:14:18 2005
+++ SPECS/radvd.spec Mon Mar 13 23:13:30 2006
@@ -17,8 +17,9 @@
BuildRequires: automake
BuildRequires: bison
BuildRequires: flex
-Requires: rc-scripts >= 0.2.0
+BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,preun): /sbin/chkconfig
+Requires: rc-scripts >= 0.2.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -71,17 +72,11 @@
%post
/sbin/chkconfig --add radvd
-if [ -f /var/lock/subsys/radvd ]; then
- /etc/rc.d/init.d/radvd restart >&2
-else
- echo "Type \"/etc/rc.d/init.d/radvd start\" to start radvd server" 1>&2
-fi
+%service radvd restart "radvd server"
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/radvd ]; then
- /etc/rc.d/init.d/radvd stop >&2
- fi
+ %service radvd stop
/sbin/chkconfig --del radvd
fi
@@ -99,6 +94,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.41 2006/03/13 22:13:30 glen
+- use %service
+
Revision 1.40 2005/12/13 15:14:18 glen
- adapterized (sorted %verify attrs)
================================================================
Index: SPECS/rarpd.spec
diff -u SPECS/rarpd.spec:1.11 SPECS/rarpd.spec:1.12
--- SPECS/rarpd.spec:1.11 Tue Dec 13 16:14:18 2005
+++ SPECS/rarpd.spec Mon Mar 13 23:13:30 2006
@@ -14,8 +14,9 @@
Patch0: %{name}-libnet1.patch
BuildRequires: libnet1-devel
BuildRequires: libpcap-devel
-Requires: rc-scripts >= 0.2.0
+BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,preun): /sbin/chkconfig
+Requires: rc-scripts >= 0.2.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -49,17 +50,11 @@
%post
/sbin/chkconfig --add rarpd
-if [ -f /var/lock/subsys/rarpd ]; then
- /etc/rc.d/init.d/rarpd restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/rarpd start\" to start rarpd daemon."
-fi
+%service rarpd restart "rarpd daemon"
%preun
if [ "$1" = "0" ];then
- if [ -f /var/lock/subsys/rarpd ]; then
- /etc/rc.d/init.d/rarpd stop >&2
- fi
+ %service rarpd stop
/sbin/chkconfig --del rarpd
fi
@@ -77,6 +72,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2006/03/13 22:13:30 glen
+- use %service
+
Revision 1.11 2005/12/13 15:14:18 glen
- adapterized (sorted %verify attrs)
================================================================
Index: SPECS/rc-inetd.spec
diff -u SPECS/rc-inetd.spec:1.44 SPECS/rc-inetd.spec:1.45
--- SPECS/rc-inetd.spec:1.44 Wed Jun 8 17:29:24 2005
+++ SPECS/rc-inetd.spec Mon Mar 13 23:13:30 2006
@@ -10,9 +10,9 @@
# Source0-md5: d0cd4c2d0ec24d4c57f87c183123d3f9
Patch0: %{name}.fix
Patch1: %{name}-noservices.patch
-PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
Requires: inetdaemon
+Requires: rc-scripts
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -40,17 +40,11 @@
%post
/sbin/chkconfig --add rc-inetd
-if [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd restart 1>&2
-else
- echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start rc-inetd service."
-fi
+%service rc-inetd restart
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd stop 1>&2
- fi
+ %service rc-inetd stop
/sbin/chkconfig --del rc-inetd
fi
@@ -67,6 +61,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.45 2006/03/13 22:13:30 glen
+- use %service
+
Revision 1.44 2005/06/08 15:29:24 mmazur
- polish the english
================================================================
Index: SPECS/rlinetd.spec
diff -u SPECS/rlinetd.spec:1.68 SPECS/rlinetd.spec:1.69
--- SPECS/rlinetd.spec:1.68 Mon Mar 13 11:26:42 2006
+++ SPECS/rlinetd.spec Mon Mar 13 23:13:30 2006
@@ -23,8 +23,8 @@
Patch0: %{name}-no_libnsl.patch
Patch1: %{name}-dblfree.patch
Patch2: %{name}-rpc.patch
-#URL: http://www.rcpt.to/rlinetd/
URL: http://packages.debian.org/rlinetd
+#URL: http://www.rcpt.to/rlinetd/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: bison
@@ -32,15 +32,16 @@
%{?with_libcap:BuildRequires: libcap-devel}
BuildRequires: libtool
BuildRequires: libwrap-devel
+BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,preun): rc-inetd
Requires: psmisc
Requires: rc-inetd
Requires: rc-scripts
Provides: inetdaemon
-Obsoletes: inetdaemon
Obsoletes: inetd
-Obsoletes: xinetd
+Obsoletes: inetdaemon
Obsoletes: netkit-base
+Obsoletes: xinetd
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -88,15 +89,11 @@
rm -rf $RPM_BUILD_ROOT
%post
-if [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd restart 1>&2
-else
- echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start rlinetd" 1>&2
-fi
+%service -q rc-inetd restart
%preun
-if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd stop
+if [ "$1" = "0" ]; then
+ %service rc-inetd stop
fi
%files
@@ -116,6 +113,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.69 2006/03/13 22:13:30 glen
+- use %service
+
Revision 1.68 2006/03/13 10:26:42 qboosh
- killed PreReq
@@ -173,7 +173,7 @@
Revision 1.52 2002/07/25 10:13:04 qboosh
- added ac25x patch needed for autoconf 2.53
-- new %%doc, release 15
+- new %doc, release 15
Revision 1.51 2002/06/23 20:32:34 kloczek
- perl -pi -e "s/^libtoolize --copy --force/\%\{__libtoolize\}/"
@@ -181,7 +181,7 @@
Revision 1.50 2002/05/21 23:14:38 kloczek
- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
s/^automake -a -c -f/\%\{__automake\}/; \
- s/^autoconf/\%\{__autoconf\}/"
+ s/^autoconf/\%\{__autoconf\}/"
Revision 1.49 2002/03/24 23:28:24 kloczek
- perl -pi -e "s/^automake -a -c$/automake -a -c -f/"
@@ -248,13 +248,13 @@
Revision 1.31 2000/09/30 22:04:00 baggins
- release 9
- added tcpsrappers patch
- (fixes "ABORT - unknown opcode 19" problem, when service is denied)
+ (fixes "ABORT - unknown opcode 19" problem, when service is denied)
Revision 1.30 2000/06/09 07:55:10 kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
Revision 1.29 2000/06/09 07:23:58 kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
Revision 1.28 2000/04/12 21:42:27 zagrodzki
- execve.patch
================================================================
Index: SPECS/routed.spec
diff -u SPECS/routed.spec:1.30 SPECS/routed.spec:1.31
--- SPECS/routed.spec:1.30 Sat Jan 28 21:24:07 2006
+++ SPECS/routed.spec Mon Mar 13 23:13:30 2006
@@ -16,8 +16,9 @@
Source1: %{name}.init
Source2: %{name}.sysconfig
Patch0: netkit-%{name}-install.patch
-Requires: rc-scripts
+BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,preun): /sbin/chkconfig
+Requires: rc-scripts
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -91,17 +92,11 @@
%post
/sbin/chkconfig --add routed
-if [ -f /var/lock/subsys/routed ]; then
- /etc/rc.d/init.d/routed restart 1>&2
-else
- echo "Type \"/etc/rc.d/init.d/routed start\" to start routed server" 1>&2
-fi
+%service routed restart "routed server"
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/routed ]; then
- /etc/rc.d/init.d/routed stop 1>&2
- fi
+ %service routed stop
/sbin/chkconfig --del routed
fi
@@ -119,6 +114,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.31 2006/03/13 22:13:30 glen
+- use %service
+
Revision 1.30 2006/01/28 20:24:07 dzeus
- s/Routed/routed/ in desc
@@ -157,7 +155,7 @@
- rel.2.
Revision 1.18 2002/01/18 02:14:48 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.17 2002/01/08 15:16:31 qboosh
- s/postun/preun/ (init.d/routed must exist to stop daemon)
@@ -169,7 +167,7 @@
- reverting last change: removing new macros from %p{re,ost}{,un}
Revision 1.13 2001/05/02 16:29:12 qboosh
-- adapterized and made spec %%debug ready or added using %%rpm*flags macros
+- adapterized and made spec %debug ready or added using %rpm*flags macros
Revision 1.12 2001/02/01 16:27:34 kloczek
- Requires for rc-scripts changed to Prereq.
@@ -197,7 +195,7 @@
- standarized spec
Revision 1.6 2000/06/09 07:23:58 kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
Revision 1.5 2000/04/10 17:06:17 baggins
- more spelling fixes
@@ -215,6 +213,5 @@
- fixed requires (PR#52)
Revision 1.1 1999/08/19 20:07:26 baggins
-almost raw
-
-Based on RedHat spec.
+- almost raw
+ Based on RedHat spec.
================================================================
Index: SPECS/rp-pppoe.spec
diff -u SPECS/rp-pppoe.spec:1.24 SPECS/rp-pppoe.spec:1.25
--- SPECS/rp-pppoe.spec:1.24 Wed Dec 21 20:06:36 2005
+++ SPECS/rp-pppoe.spec Mon Mar 13 23:13:30 2006
@@ -21,6 +21,7 @@
URL: http://www.roaringpenguin.com/pppoe/
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: rpmbuild(macros) >= 1.268
Requires: ppp >= 2.4.1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -150,33 +151,21 @@
%post server
/sbin/chkconfig --add pppoe-server
-if [ -f /var/lock/subsys/pppoe-server ]; then
- /etc/rc.d/init.d/pppoe-server restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/pppoe-server start\" to start PPPoE daemon."
-fi
+%service pppoe-server restart "PPPoE daemon"
%preun server
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/pppoe-server ]; then
- /etc/rc.d/init.d/pppoe-server stop 1>&2
- fi
+ %service pppoe-server stop
/sbin/chkconfig --del pppoe-server
fi
%post relay
/sbin/chkconfig --add pppoe-relay
-if [ -f /var/lock/subsys/pppoe-relay ]; then
- /etc/rc.d/init.d/pppoe-relay restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/pppoe-relay start\" to start PPPoE relay daemon."
-fi
+%service pppoe-relay restart "PPPoE relay daemon"
%preun relay
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/pppoe-relay ]; then
- /etc/rc.d/init.d/pppoe-relay stop 1>&2
- fi
+ %service pppoe-relay stop
/sbin/chkconfig --del pppoe-relay
fi
@@ -228,6 +217,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.25 2006/03/13 22:13:30 glen
+- use %service
+
Revision 1.24 2005/12/21 19:06:36 arekm
- md5 fix
================================================================
Index: SPECS/rpld.spec
diff -u SPECS/rpld.spec:1.16 SPECS/rpld.spec:1.17
--- SPECS/rpld.spec:1.16 Mon Dec 5 00:37:15 2005
+++ SPECS/rpld.spec Mon Mar 13 23:13:30 2006
@@ -12,6 +12,7 @@
Source2: %{name}.sysconfig
Patch0: %{name}-build.patch
URL: http://gimel.esc.cam.ac.uk/james/rpld/
+BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,preun): /sbin/chkconfig
Requires: rc-scripts
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,17 +49,11 @@
%post
/sbin/chkconfig --add rpld
-if [ -f /var/lock/subsys/rpld ]; then
- /etc/rc.d/init.d/rpld restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/rpld start\" to start RPL daemon."
-fi
+%service rpld restart "RPL daemon"
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/rpld ]; then
- /etc/rc.d/init.d/rpld stop 1>&2
- fi
+ %service rpld stop
/sbin/chkconfig --del rpld
fi
@@ -78,6 +73,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2006/03/13 22:13:30 glen
+- use %service
+
Revision 1.16 2005/12/04 23:37:15 glen
- adapterized (sorted %verify flags)
================================================================
Index: SPECS/rusers.spec
diff -u SPECS/rusers.spec:1.38 SPECS/rusers.spec:1.39
--- SPECS/rusers.spec:1.38 Sat May 21 19:27:34 2005
+++ SPECS/rusers.spec Mon Mar 13 23:13:30 2006
@@ -20,6 +20,7 @@
Patch0: netkit-%{name}-numusers.patch
Patch1: rstatd-jbj.patch
BuildRequires: procps-devel >= 1:3.2.5-3
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -61,8 +62,8 @@
Summary(pl): Serwer protokołu rusers
Summary(pt_BR): Servidor para o protocolo rusers
Group: Networking/Daemons
-PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
+Requires: rc-scripts
Obsoletes: rusers-server
%description -n rusersd
@@ -101,8 +102,8 @@
Summary: kernel statistics server
Summary(pl): Serwer rstatd
Group: Networking/Daemons
-PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
+Requires: rc-scripts
%description -n rstatd
rpc.rstatd is a server which returns performance statistics obtained
@@ -114,7 +115,7 @@
Statystyki te zwykle są czytane komendą rup(1).
%prep
-%setup -q -n netkit-rusers-%{version} -a3
+%setup -q -n netkit-%{name}-%{version} -a3
%patch0 -p1
%patch1 -p1
@@ -156,33 +157,21 @@
%post -n rusersd
/sbin/chkconfig --add rusersd
-if [ -f /var/lock/subsys/rusersd ]; then
- /etc/rc.d/init.d/rusersd restart 1>&2
-else
- echo "Type \"/etc/rc.d/init.d/rusersd start\" to start rusersd server" 1>&2
-fi
+%service rusersd restart "rusersd server"
%preun -n rusersd
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/rusersd ]; then
- /etc/rc.d/init.d/rusersd stop 1>&2
- fi
+ %service rusersd stop
/sbin/chkconfig --del rusersd
fi
%post -n rstatd
/sbin/chkconfig --add rstatd
-if [ -f /var/lock/subsys/rstatd ]; then
- /etc/rc.d/init.d/rstatd restart 1>&2
-else
- echo "Type \"/etc/rc.d/init.d/rstatd start\" to start rstatd server" 1>&2
-fi
+%service rstatd restart "rstatd server"
%preun -n rstatd
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/rstatd ]; then
- /etc/rc.d/init.d/rstatd stop 1>&2
- fi
+ %service rstatd stop
/sbin/chkconfig --del rstatd
fi
@@ -216,6 +205,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.39 2006/03/13 22:13:30 glen
+- use %service
+
Revision 1.38 2005/05/21 17:27:34 speedy
- release 20
- BR: procps-devel => 1:3.2.5-3 (fixed devel)
@@ -258,7 +250,7 @@
Group field using gettext).
Revision 1.25 2002/01/18 02:14:50 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.24 2002/01/08 15:19:12 qboosh
- rusersd,rstatd: s/postun/preun/ (init script must exist to stop daemon); release 14
@@ -276,13 +268,13 @@
- reverting last change: removing new macros from %p{re,ost}{,un}
Revision 1.19 2001/05/02 16:29:12 qboosh
-- adapterized and made spec %%debug ready or added using %%rpm*flags macros
+- adapterized and made spec %debug ready or added using %rpm*flags macros
Revision 1.18 2001/02/01 16:27:34 kloczek
- Requires for rc-scripts changed to Prereq.
Revision 1.17 2001/01/25 20:03:48 misiek
-Massive attack. We use -O0 instead -O flags while debug enabled.
+- Massive attack. We use -O0 instead -O flags while debug enabled.
Revision 1.16 2000/10/19 01:22:13 kloczek
- merge old BeroLinux de, fr, tr translations.
@@ -291,11 +283,11 @@
- release 7,
- rusers, rpc.rusersd, rup and rpc.rstatd now in four separated
subpackages,
-- use CC="%%{__cc}" in make parameters because silly configure script uses
+- use CC="%{__cc}" in make parameters because silly configure script uses
egcs if found.
Revision 1.14 2000/10/10 20:11:56 kloczek
-- adapterized, make %%{debug} ready and added uing new rpm automation suit
+- adapterized, make %{debug} ready and added uing new rpm automation suit
but still need work on separate clients and servers.
Revision 1.13 2000/09/29 15:40:21 zagrodzki
@@ -317,10 +309,10 @@
- added/removed patches
Revision 1.8 2000/06/09 07:55:10 kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
Revision 1.7 2000/06/09 07:23:59 kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
Revision 1.6 2000/04/10 17:06:17 baggins
- more spelling fixes
@@ -342,7 +334,7 @@
- cleanup for PLD (FHS 2.0, macros)
Revision 1.1 1999/08/19 20:07:26 baggins
-almost raw
+- almost raw
* Tue Apr 6 1999 Jeff Johnson <jbj at redhat.com>
- add rpc.rstatd (#2000)
================================================================
Index: SPECS/rwall.spec
diff -u SPECS/rwall.spec:1.32 SPECS/rwall.spec:1.33
--- SPECS/rwall.spec:1.32 Mon Apr 26 20:41:09 2004
+++ SPECS/rwall.spec Mon Mar 13 23:13:30 2006
@@ -1,7 +1,7 @@
# $Revision$, $Date$
Summary: Client for sending messages to a host's logged in users
-Summary(es): Cliente y servidor para enviar mensajes para usuarios en máquinas remotas
Summary(de): Client zum Senden von Nachrichten an Benutzer am entfernten Host
+Summary(es): Cliente y servidor para enviar mensajes para usuarios en máquinas remotas
Summary(fr): Client pour envoyer des messages aux utilisteurs de machines distantes
Summary(pl): Klient do wysyłania komunikatów do zalogowanych użytkowników
Summary(pt_BR): Cliente e servidor para enviar mensagens para usuários em máquinas remotas
@@ -15,6 +15,7 @@
# Source0-md5: c7a85262fc9911e0574ce5706ce69369
Source1: %{name}d.init
Patch0: netkit-%{name}-WALL_CMD.patch
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -60,8 +61,8 @@
Summary: Server for sending messages to a host's logged in users
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/radvd.spec?r1=1.40&r2=1.41&f=u
http://cvs.pld-linux.org/SPECS/rarpd.spec?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/SPECS/rc-inetd.spec?r1=1.44&r2=1.45&f=u
http://cvs.pld-linux.org/SPECS/rlinetd.spec?r1=1.68&r2=1.69&f=u
http://cvs.pld-linux.org/SPECS/routed.spec?r1=1.30&r2=1.31&f=u
http://cvs.pld-linux.org/SPECS/rp-pppoe.spec?r1=1.24&r2=1.25&f=u
http://cvs.pld-linux.org/SPECS/rpld.spec?r1=1.16&r2=1.17&f=u
http://cvs.pld-linux.org/SPECS/rusers.spec?r1=1.38&r2=1.39&f=u
http://cvs.pld-linux.org/SPECS/rwall.spec?r1=1.32&r2=1.33&f=u
http://cvs.pld-linux.org/SPECS/rwho.spec?r1=1.30&r2=1.31&f=u
More information about the pld-cvs-commit
mailing list