Author: glen Date: Mon Mar 13 23:27:57 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %service
---- Files affected:
SPECS:
qpopper.spec (1.76 -> 1.77) , quagga.spec (1.31 -> 1.32) , quake2.spec (1.55
-> 1.56) , quake3.spec (1.66 -> 1.67) , quakeforge.spec (1.80 -> 1.81) ,
quota.spec (1.78 -> 1.79)
---- Diffs:
================================================================
Index: SPECS/qpopper.spec
diff -u SPECS/qpopper.spec:1.76 SPECS/qpopper.spec:1.77
--- SPECS/qpopper.spec:1.76 Tue May 24 16:42:18 2005
+++ SPECS/qpopper.spec Tue Mar 14 00:27:51 2006
@@ -37,6 +37,7 @@
BuildRequires: gdbm-devel
%{?with_mysql:BuildRequires: mysql-devel}
BuildRequires: pam-devel
+BuildRequires: rpmbuild(macros) >= 1.268
Requires: pam >= 0.79.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -93,14 +94,14 @@
Summary: inetd configs for Qpopper
Summary(pl): Pliki konfiguracyjne do użycia Qpoppera poprzez inetd
Group: Networking/Daemons
-PreReq: %{name}-common = %{version}-%{release}
-PreReq: rc-inetd
-Provides: qpopper = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
Requires: inetdaemon
+Requires: rc-inetd
+Provides: qpopper = %{version}-%{release}
+Obsoletes: imap-pop
Obsoletes: qpopper-standalone
Obsoletes: qpopper6
Obsoletes: solid-pop3d
-Obsoletes: imap-pop
%description inetd
Qpopper configs for running from inetd.
@@ -112,10 +113,10 @@
Summary: inetd configs for Qpopper with SSL (pop3s)
Summary(pl): Pliki konfiguracyjne do użycia Qpoppera poprzez inetd z obslugą
SSL (pop3s)
Group: Networking/Daemons
-PreReq: %{name}-common = %{version}-%{release}
-PreReq: %{name}-inetd = %{version}-%{release}
-PreReq: rc-inetd
+Requires: %{name}-common = %{version}-%{release}
+Requires: %{name}-inetd = %{version}-%{release}
Requires: inetdaemon
+Requires: rc-inetd
%description ssl-inetd
Qpopper configs for running from inetd with SSL (pop3s).
@@ -128,14 +129,14 @@
Summary: standalone daemon configs for Qpopper
Summary(pl): Pliki konfiguracyjne do startowania Qpoppera w trybie standalone
Group: Networking/Daemons
-PreReq: %{name}-common = %{version}
-PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
+Requires: %{name}-common = %{version}
+Requires: rc-scripts
Provides: qpopper = %{version}-%{release}
+Obsoletes: imap-pop
Obsoletes: qpopper-inetd
Obsoletes: qpopper6
Obsoletes: solid-pop3d
-Obsoletes: imap-pop
%description standalone
Qpopper configs for running as a standalone daemon.
@@ -148,10 +149,10 @@
Summary: standalone daemon configs for Qpopper with SSL on separate port
(pop3s)
Summary(pl): Pliki konfiguracyjne do startowania Qpoppera w trybie
standalone z obsługą SSL na oddzielnym porcie (pop3s)
Group: Networking/Daemons
-PreReq: %{name}-common = %{version}-%{release}
-PreReq: %{name}-standalone = %{version}-%{release}
-PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
+Requires: %{name}-common = %{version}-%{release}
+Requires: %{name}-standalone = %{version}-%{release}
+Requires: rc-scripts
%description ssl-standalone
Qpopper configs for running as a standalone daemon in SSL mode on
@@ -276,58 +277,38 @@
fi
%post 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 inet server"
1>&2
-fi
+%service -q rc-inetd reload
%postun inetd
-if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd restart 1>&2
+if [ "$1" = "0" ]; then
+ %service -q rc-inetd reload
fi
%post ssl-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 inet server"
1>&2
-fi
+%service -q rc-inetd reload
%postun ssl-inetd
-if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd restart 1>&2
+if [ "$1" = "0" ]; then
+ %service -q rc-inetd reload
fi
%post standalone
/sbin/chkconfig --add qpopper
-if [ -f /var/lock/subsys/qpopper ]; then
- /etc/rc.d/init.d/qpopper restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/qpopper start\" to start Qpopper daemon."
-fi
+%service qpopper restart "Qpopper daemon"
%preun standalone
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/qpopper ]; then
- /etc/rc.d/init.d/qpopper stop 1>&2
- fi
+ %service qpopper stop
/sbin/chkconfig --del qpopper
fi
%post ssl-standalone
/sbin/chkconfig --add qpoppers
-if [ -f /var/lock/subsys/qpoppers ]; then
- /etc/rc.d/init.d/qpoppers restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/qpoppers start\" to start Qpopper SSL
daemon."
-fi
+%service qpoppers restart "Qpopper SSL daemon"
%preun ssl-standalone
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/qpoppers ]; then
- /etc/rc.d/init.d/qpoppers stop 1>&2
- fi
+ %service qpoppers stop
/sbin/chkconfig --del qpoppers
fi
@@ -376,6 +357,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.77 2006/03/13 23:27:51 glen
+- use %service
+
Revision 1.76 2005/05/24 14:42:18 baggins
- new URL
- STBR
================================================================
Index: SPECS/quagga.spec
diff -u SPECS/quagga.spec:1.31 SPECS/quagga.spec:1.32
--- SPECS/quagga.spec:1.31 Sun Feb 5 11:56:52 2006
+++ SPECS/quagga.spec Tue Mar 14 00:27:51 2006
@@ -45,18 +45,18 @@
BuildRequires: pam-devel
BuildRequires: perl-base
BuildRequires: readline-devel >= 4.1
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: texinfo
-PreReq: rc-scripts
-Requires(pre): /bin/id
-Requires(pre): /usr/bin/getgid
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
Requires(post): /bin/hostname
Requires(post): /sbin/ldconfig
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: rc-scripts
Provides: group(quagga)
Provides: group(quaggavty)
Provides: routingdaemon
@@ -64,8 +64,8 @@
Obsoletes: bird
Obsoletes: gated
Obsoletes: mrt
-Obsoletes: zebra-xs26
Obsoletes: quagga
+Obsoletes: zebra-xs26
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/%{name}
@@ -120,8 +120,8 @@
Summary: IPv6 OSPF routing daemon
Summary(pl): Demon routingu OSPF w sieciach IPv6
Group: Networking/Daemons
-Requires: %{name} = %{version}-%{release}
Requires(post,preun): /sbin/chkconfig
+Requires: %{name} = %{version}-%{release}
Obsoletes: zebra-xs26-ospf6d
%description ospf6d
@@ -147,8 +147,8 @@
Summary: IPv6 RIP routing daemon
Summary(pl): Demon routingu RIP w sieciach IPv6
Group: Networking/Daemons
-Requires: %{name} = %{version}-%{release}
Requires(post,preun): /sbin/chkconfig
+Requires: %{name} = %{version}-%{release}
Obsoletes: zebra-xs26-ripngd
%description ripngd
@@ -161,8 +161,8 @@
Summary: IS-IS routing daemon
Summary(pl): Demon routingu IS-IS
Group: Networking/Daemons
-Requires: %{name} = %{version}-%{release}
Requires(post,preun): /sbin/chkconfig
+Requires: %{name} = %{version}-%{release}
%description isisd
IS-IS routing daemon.
@@ -284,131 +284,89 @@
if [ ! -s %{_sysconfdir}/zebra.conf ]; then
echo "hostname `hostname`" > %{_sysconfdir}/zebra.conf
fi
-if [ -f /var/lock/subsys/zebra ]; then
- /etc/rc.d/init.d/zebra restart >&2
-else
- echo "Run '/etc/rc.d/init.d/zebra start' to start main routing deamon."
>&2
-fi
+%service zebra restart "main routing deamon"
%post bgpd
/sbin/chkconfig --add bgpd >&2
if [ ! -s %{_sysconfdir}/bgpd.conf ]; then
echo "hostname `hostname`" > %{_sysconfdir}/bgpd.conf
fi
-if [ -f /var/lock/subsys/bgpd ]; then
- /etc/rc.d/init.d/bgpd restart >&2
-else
- echo "Run '/etc/rc.d/init.d/bgpd start' to start bgpd routing deamon."
>&2
-fi
+%service bgpd restart "bgpd routing daemon"
%post ospfd
/sbin/chkconfig --add ospfd >&2
if [ ! -s %{_sysconfdir}/ospfd.conf ]; then
echo "hostname `hostname`" > %{_sysconfdir}/ospfd.conf
fi
-if [ -f /var/lock/subsys/ospfd ]; then
- /etc/rc.d/init.d/ospfd restart >&2
-else
- echo "Run '/etc/rc.d/init.d/ospfd start' to start ospfd routing
deamon." >&2
-fi
+%service ospfd restart "ospfd routing deamon"
%post ospf6d
/sbin/chkconfig --add ospf6d >&2
if [ ! -s %{_sysconfdir}/ospf6d.conf ]; then
echo "hostname `hostname`" > %{_sysconfdir}/ospf6d.conf
fi
-if [ -f /var/lock/subsys/ospf6d ]; then
- /etc/rc.d/init.d/ospf6d restart >&2
-else
- echo "Run '/etc/rc.d/init.d/ospf6d start' to start ospf6d routing
deamon." >&2
-fi
+%service ospf6d restart "ospf6d routing deamon"
%post ripd
/sbin/chkconfig --add ripd >&2
if [ ! -s %{_sysconfdir}/ripd.conf ]; then
echo "hostname `hostname`" > %{_sysconfdir}/ripd.conf
fi
-if [ -f /var/lock/subsys/ripd ]; then
- /etc/rc.d/init.d/ripd restart >&2
-else
- echo "Run '/etc/rc.d/init.d/ripd start' to start ripd routing deamon."
>&2
-fi
+%service ripd restart "ripd routing deamon"
%post ripngd
/sbin/chkconfig --add ripngd >&2
if [ ! -s %{_sysconfdir}/ripngd.conf ]; then
echo "hostname `hostname`" > %{_sysconfdir}/ripngd.conf
fi
-if [ -f /var/lock/subsys/ripngd ]; then
- /etc/rc.d/init.d/ripngd restart >&2
-else
- echo "Run '/etc/rc.d/init.d/ripngd start' to start ripngd routing
deamon." >&2
-fi
+%service ripngd restart "ripngd routing deamon"
%post isisd
/sbin/chkconfig --add isisd >&2
if [ ! -s %{_sysconfdir}/isisd.conf ]; then
echo "hostname `hostname`" > %{_sysconfdir}/isisd.conf
fi
-if [ -f /var/lock/subsys/isisd ]; then
- /etc/rc.d/init.d/isisd restart >&2
-else
- echo "Run '/etc/rc.d/init.d/isisd start' to start IS-IS routing
deamon." >&2
-fi
+%service isisd restart "IS-IS routing deamon"
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/zebra ]; then
- /etc/rc.d/init.d/zebra stop >&2
- fi
+ %service zebra stop
/sbin/chkconfig --del zebra >&2
fi
%preun bgpd
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/bgpd ]; then
- /etc/rc.d/init.d/bgpd stop >&2
- fi
+ %service bgpd stop
/sbin/chkconfig --del bgpd >&2
fi
%preun ospfd
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/ospfd ]; then
- /etc/rc.d/init.d/ospfd stop >&2
- fi
+ %service ospfd stop
/sbin/chkconfig --del ospfd >&2
fi
%preun ospf6d
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/ospf6d ]; then
- /etc/rc.d/init.d/ospf6d stop >&2
- fi
+ %service ospf6d stop
/sbin/chkconfig --del ospf6d >&2
fi
%preun ripd
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/ripd ]; then
- /etc/rc.d/init.d/ripd stop >&2
- fi
+ %service ripd stop
/sbin/chkconfig --del ripd >&2
fi
%preun ripngd
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/ripngd ]; then
- /etc/rc.d/init.d/ripngd stop >&2
- fi
+ %service ripngd stop
/sbin/chkconfig --del ripngd >&2
fi
%preun isisd
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/isisd ]; then
- /etc/rc.d/init.d/isisd stop >&2
- fi
+ %service isisd stop
/sbin/chkconfig --del isisd >&2
fi
@@ -525,6 +483,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2006/03/13 23:27:51 glen
+- use %service
+
Revision 1.31 2006/02/05 10:56:52 arekm
- updated to 0.99.3
================================================================
Index: SPECS/quake2.spec
diff -u SPECS/quake2.spec:1.55 SPECS/quake2.spec:1.56
--- SPECS/quake2.spec:1.55 Wed Jan 25 17:42:12 2006
+++ SPECS/quake2.spec Tue Mar 14 00:27:51 2006
@@ -29,6 +29,7 @@
BuildRequires: libao-devel >= 0.8.5
BuildRequires: libltdl-devel
BuildRequires: libtool
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: svgalib-devel
BuildRequires: unzip
Requires: %{name}-renderer
@@ -82,7 +83,7 @@
Group: X11/Applications/Games
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: %{name}-renderer
-Obsoletes: %{name}-3DFX
+Obsoletes: quake2-3DFX
%description 3dfx
Play Quake2 using 3DFX acceleration.
@@ -97,7 +98,7 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: OpenGL
Provides: %{name}-renderer
-Obsoletes: %{name}-GLX
+Obsoletes: quake2-GLX
%description glx
Play Quake2 using hardware OpenGL acceleration.
@@ -137,7 +138,7 @@
Group: Applications/Games
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: %{name}-renderer
-Obsoletes: %{name}-svgalib
+Obsoletes: quake2-svgalib
%description svga
Quake2 libraries for SVGAlib play.
@@ -151,8 +152,8 @@
Group: X11/Applications/Games
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: %{name}-renderer
-Obsoletes: %{name}-software-X11
-Obsoletes: %{name}-X11
+Obsoletes: quake2-X11
+Obsoletes: quake2-software-X11
%description x11
Play Quake2 using software X11 renderer.
@@ -268,17 +269,11 @@
%post server
/sbin/chkconfig --add quake2-server
-if [ -f /var/lock/subsys/quake2-server ]; then
- /etc/rc.d/init.d/quake2-server restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/quake2-server start\" to start Quake2
server."
-fi
+%service quake2-server restart "Quake2 server"
%preun server
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/quake2-server ]; then
- /etc/rc.d/init.d/quake2-server stop 1>&2
- fi
+ %service quake2-server stop
/sbin/chkconfig --del quake2-server
fi
@@ -368,6 +363,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.56 2006/03/13 23:27:51 glen
+- use %service
+
Revision 1.55 2006/01/25 16:42:12 ankry
- added -gl patch (fixed build), rel. 2, STBR
================================================================
Index: SPECS/quake3.spec
diff -u SPECS/quake3.spec:1.66 SPECS/quake3.spec:1.67
--- SPECS/quake3.spec:1.66 Fri Mar 3 21:00:02 2006
+++ SPECS/quake3.spec Tue Mar 14 00:27:51 2006
@@ -5,11 +5,11 @@
%bcond_without openal # don't use OpenAL
%define _dataver 1.32b3
+%define _snap 20060301
Summary: Quake3 for Linux
Summary(pl): Quake3 dla Linuksa
Name: quake3
Version: 1.33
-%define _snap 20060301
Release: 0.%{_snap}.1
License: GPL v2
Group: Applications/Games
@@ -29,7 +29,7 @@
%endif
BuildRequires: OpenGL-devel
BuildRequires: SDL-devel
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: rpmbuild(macros) >= 1.268
Requires: %{name}-common = %{version}-%{release}
Requires: OpenGL
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,18 +51,18 @@
Summary: Quake3 server
Summary(pl): Serwer Quake3
Group: Applications/Games
-Requires: 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(triggerpostun): /usr/sbin/usermod
Requires: %{name}-common = %{version}-%{release}
-Requires: screen
Requires: psmisc
+Requires: rc-scripts
+Requires: screen
Provides: group(quake3)
Provides: user(quake3)
@@ -171,17 +171,11 @@
%post server
/sbin/chkconfig --add q3ded
-if [ -f /var/lock/subsys/q3ded ]; then
- /etc/rc.d/init.d/q3ded restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/q3ded start\" to start Quake3 server"
-fi
+%service q3ded restart "Quake3 server"
%preun server
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/q3ded ]; then
- /etc/rc.d/init.d/q3ded stop 1>&2
- fi
+ %service q3ded stop
/sbin/chkconfig --del q3ded
fi
@@ -194,7 +188,7 @@
%triggerpostun server -- %{name}-server < 1.33
if [ -f /var/lock/subsys/q3ded ]; then
# server will fail because of lack of pak0.pk3
- /etc/rc.d/init.d/q3ded stop 1>&2
+ /sbin/service q3ded stop 1>&2
fi
if [ "`getent passwd quake3 | cut -d: -f6`" = "/opt/quake3" ]; then
/usr/sbin/usermod -d /var/games/quake3 -s /bin/sh quake3
@@ -207,6 +201,7 @@
echo "Quake 3 data location has changed, link or move pak0.pk3 to
%{_datadir}/games/%{name}/baseq3/."
echo ""
fi
+
if [ "$1" = "0" ]; then
%userremove quake3
%groupremove quake3
@@ -247,6 +242,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.67 2006/03/13 23:27:51 glen
+- use %service
+
Revision 1.66 2006/03/03 20:00:02 sparky
- snapshot updated, more docs
================================================================
Index: SPECS/quakeforge.spec
diff -u SPECS/quakeforge.spec:1.80 SPECS/quakeforge.spec:1.81
--- SPECS/quakeforge.spec:1.80 Tue Dec 13 16:59:58 2005
+++ SPECS/quakeforge.spec Tue Mar 14 00:27:51 2006
@@ -38,7 +38,7 @@
BuildRequires: bison
BuildRequires: libtool
BuildRequires: libvorbis-devel
-BuildRequires: rpmbuild(macros) >= 1.176
+BuildRequires: rpmbuild(macros) >= 1.268
%{?with_svga:BuildRequires: svgalib-devel}
BuildRequires: xmms-devel
BuildRequires: zlib-devel
@@ -404,7 +404,7 @@
touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/qw-server.cfg
install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/
+install %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d
install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/qw
qfver="glx sdl sdl32 sgl x11"
@@ -452,33 +452,17 @@
%post servers
/sbin/chkconfig --add qw-serverd
-if [ -f /var/lock/subsys/qw-serverd ]; then
- /etc/rc.d/init.d/qw-serverd restart 1>&2
-else
- %banner %{name}-servers -e << EOF
-Run \"/etc/rc.d/init.d/qw-serverd start\" to start QuakeWorld Server.
-EOF
-fi
+%service qw-serverd restart "QuakeWorld Server"
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/qpopper.spec?r1=1.76&r2=1.77&f=u
http://cvs.pld-linux.org/SPECS/quagga.spec?r1=1.31&r2=1.32&f=u
http://cvs.pld-linux.org/SPECS/quake2.spec?r1=1.55&r2=1.56&f=u
http://cvs.pld-linux.org/SPECS/quake3.spec?r1=1.66&r2=1.67&f=u
http://cvs.pld-linux.org/SPECS/quakeforge.spec?r1=1.80&r2=1.81&f=u
http://cvs.pld-linux.org/SPECS/quota.spec?r1=1.78&r2=1.79&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
