SPECS: dcd.spec, ddclient.spec, dhcp.spec, distcc.spec, dnsmasq.sp...
glen
glen at pld-linux.org
Fri Feb 24 16:35:54 CET 2006
Author: glen Date: Fri Feb 24 15:35:54 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %service
---- Files affected:
SPECS:
dcd.spec (1.79 -> 1.80) , ddclient.spec (1.13 -> 1.14) , dhcp.spec (1.109 -> 1.110) , distcc.spec (1.91 -> 1.92) , dnsmasq.spec (1.46 -> 1.47)
---- Diffs:
================================================================
Index: SPECS/dcd.spec
diff -u SPECS/dcd.spec:1.79 SPECS/dcd.spec:1.80
--- SPECS/dcd.spec:1.79 Tue Jan 24 17:21:55 2006
+++ SPECS/dcd.spec Fri Feb 24 16:35:49 2006
@@ -6,7 +6,6 @@
Release: 1
License: GPL v2
Group: Networking/Daemons
-Vendor: DConnect Team <dc-hub at ds.pg.gda.pl>
Source0: ftp://pollux.ds.pg.gda.pl/pub/Linux/DConnect/sources/stable/%{name}-%{version}.tar.bz2
# Source0-md5: 35cc5d427004a3aa5ff46427f3b59a6a
URL: http://www.dc.ds.pg.gda.pl/
@@ -14,6 +13,7 @@
BuildRequires: automake
BuildRequires: libtool
BuildRequires: libwrap-devel
+BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,preun): /sbin/chkconfig
Requires(triggerpostun): sed >= 4.0
Requires: rc-scripts
@@ -58,17 +58,11 @@
%post
/sbin/chkconfig --add dcd
-if [ -f /var/lock/subsys/dcd ]; then
- /etc/rc.d/init.d/dcd restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/dcd start\" to start DConnect Daemon."
-fi
+%service dcd restart "DConnect Daemon"
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/dcd ]; then
- /etc/rc.d/init.d/dcd stop 1>&2
- fi
+ %service dcd stop
/sbin/chkconfig --del dcd
fi
@@ -108,7 +102,7 @@
%attr(664,root,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.welcome
%attr(664,daemon,daemon) %config(noreplace) %{_sysconfdir}/dcd/nicks.allow
%attr(664,daemon,daemon) %config(noreplace) %{_sysconfdir}/dcd/dcd.rules
-%config(noreplace) /etc/sysconfig/dcd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dcd
%config(noreplace) /etc/logrotate.d/dcd
%attr(755,root,root) %{_sbindir}/dcd
%attr(755,root,root) %{_sbindir}/dcd.adduser
@@ -124,6 +118,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.80 2006/02/24 15:35:49 glen
+- use %service
+
Revision 1.79 2006/01/24 16:21:55 blues
- 0.6.1 - security fixes (chat forgery). STBR, please.
================================================================
Index: SPECS/ddclient.spec
diff -u SPECS/ddclient.spec:1.13 SPECS/ddclient.spec:1.14
--- SPECS/ddclient.spec:1.13 Fri Feb 3 01:31:16 2006
+++ SPECS/ddclient.spec Fri Feb 24 16:35:49 2006
@@ -7,15 +7,16 @@
Epoch: 1
Version: 3.6.7
Release: 1
-Group: Networking
License: GPL v2
+Group: Networking
Source0: http://dl.sourceforge.net/ddclient/%{name}-%{version}.tar.bz2
# Source0-md5: b07a29a891dcf40b941b9bc5ef3ce598
Source1: %{name}.init
URL: http://ddclient.sourceforge.net/
BuildRequires: rpm-perlprov
-Requires: rc-scripts
+BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,preun): /sbin/chkconfig
+Requires: rc-scripts
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,7 +65,7 @@
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir}/ddclient,/etc/rc.d/init.d,%{_sbindir}}
-install sample-etc_ddclient.conf $RPM_BUILD_ROOT/etc/%{name}/%{name}.conf
+install sample-etc_ddclient.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.conf
install %{name} $RPM_BUILD_ROOT%{_sbindir}
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
@@ -73,17 +74,11 @@
%post
/sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
- /etc/rc.d/init.d/%{name} restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon."
-fi
+%service %{name} restart "%{name} daemon"
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/%{name} ]; then
- /etc/rc.d/init.d/%{name} stop >&2
- fi
+ %service %{name} stop
/sbin/chkconfig --del %{name}
fi
@@ -109,6 +104,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2006/02/24 15:35:49 glen
+- use %service
+
Revision 1.13 2006/02/03 00:31:16 undefine
- up to 3.6.7 by Patryk Szczygłowski <patryk at patryk.one.pl>
================================================================
Index: SPECS/dhcp.spec
diff -u SPECS/dhcp.spec:1.109 SPECS/dhcp.spec:1.110
--- SPECS/dhcp.spec:1.109 Wed Feb 8 23:39:16 2006
+++ SPECS/dhcp.spec Fri Feb 24 16:35:49 2006
@@ -11,7 +11,6 @@
Version: 3.0.3
Release: 3
Epoch: 3
-Vendor: ISC
License: distributable
Group: Networking/Daemons
Source0: ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
@@ -28,6 +27,7 @@
URL: http://www.isc.org/sw/dhcp/
BuildRequires: groff
%{?with_ldap:BuildRequires: openldap-devel}
+BuildRequires: rpmbuild(macros) >= 1.268
Requires(post): fileutils
Requires(post,preun): /sbin/chkconfig
Requires: rc-scripts >= 0.2.0
@@ -69,8 +69,8 @@
Summary(pl): Klient DHCP
Group: Networking/Daemons
Requires(post): fileutils
-Obsoletes: pump
Obsoletes: dhclient
+Obsoletes: pump
%description client
Dynamic Host Configuration Protocol Client.
@@ -189,51 +189,37 @@
%post
/sbin/chkconfig --add dhcpd
touch /var/lib/%{name}/dhcpd.leases
-
if [ ! -d /var/lib/dhcp ]; then
install -d /var/lib/dhcp
fi
-
-if [ -f /var/lock/subsys/dhcpd ]; then
- /etc/rc.d/init.d/dhcpd restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/dhcpd start\" to start dhcpd daemon."
-fi
+%service dhcpd restart "dhcpd daemon"
%preun
if [ "$1" = "0" ];then
- if [ -f /var/lock/subsys/dhcpd ]; then
- /etc/rc.d/init.d/dhcpd stop >&2
- fi
+ %service dhcpd stop
/sbin/chkconfig --del dhcpd
fi
%post client
-if [ -d /var/lib/dhcp ]; then
+if [ ! -d /var/lib/dhcp ]; then
install -d /var/lib/dhcp
fi
%post relay
/sbin/chkconfig --add dhcp-relay
if [ -f /var/lock/subsys/dhcrelay ]; then
- mv -f /var/lock/subsys/dhcrelay /var/lock/subsys/dhcp-relay
-fi
-if [ -f /var/lock/subsys/dhcp-relay ]; then
- /etc/rc.d/init.d/dhcp-relay restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/dhcp-relay start\" to start dhcrelay daemon."
+ mv -f /var/lock/subsys/{dhcrelay,dhcp-relay}
fi
+%service dhcp-relay restart "dhcrelay daemon"
%preun relay
if [ "$1" = "0" ];then
- if [ -f /var/lock/subsys/dhcp-relay ]; then
- /etc/rc.d/init.d/dhcp-relay stop >&2
- fi
+ %service dhcp-relay stop
/sbin/chkconfig --del dhcp-relay
fi
%triggerpostun -- dhcp < 3.0
-if [ `grep ddns-update-style /etc/dhcpd.conf` = "" ]; then
+if [ "`grep ddns-update-style /etc/dhcpd.conf`" = "" ]; then
umask 027
echo "ddns-update-style none;" > /etc/dhcpd.conf.tmp
echo "" >> /etc/dhcpd.conf.tmp
@@ -282,6 +268,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.110 2006/02/24 15:35:49 glen
+- use %service
+
Revision 1.109 2006/02/08 22:39:16 patrys
- added DBUS support for NetworkManager
@@ -297,7 +286,10 @@
- release 0.1, anyone has tested build with USE_SOCKET_FALLBACK?
Revision 1.105 2005/06/01 13:47:34 jajcus
-- build with USE_SOCKET_FALLBACK. Without that dhcp-relay always uses the last interface detected/specified for sending messages to servers, ignoring host's routing table. Needs testing to see if nothing is broken.
+- build with USE_SOCKET_FALLBACK. Without that dhcp-relay always uses
+ the last interface detected/specified for sending messages to
+ servers, ignoring host's routing table. Needs testing to see if
+ nothing is broken.
Revision 1.104 2005/03/22 21:12:42 hawk
- updated to 3.0.2 stable
@@ -395,13 +387,13 @@
- rel 2
Revision 1.77 2002/10/10 13:33:18 marcus
-- use new %%doc
+- use new %doc
Revision 1.76 2002/05/08 21:25:43 lukasz
- CERT Advisory CA-2002-12 Format String Vulnerability
Revision 1.75 2002/04/25 16:11:34 arturs
-fixed a small typo
+- fixed a small typo
Revision 1.74 2002/03/29 11:09:33 blues
- files fixed - builds now
@@ -426,7 +418,7 @@
Group field using gettext).
Revision 1.67 2002/01/18 02:12:41 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.66 2001/11/10 16:45:30 jajcus
- s/Distibutable/distributable/ in License
@@ -447,7 +439,7 @@
- release 2,
- added "%triggerpostun -- dhcp < 3.0" script with add on top dhcpd.conf
"ddns-update-style none;" line if not exist. Thos allow smooth upgrade from
- < 3.0 dhcp to current because new dhcpd reuires in dhcpd.conf entry with info
+ < 3.0 dhcp to current because new dhcpd requires in dhcpd.conf entry with info
about dynamic dns update style handling. This trigger by default adds
disabled ddns update.
@@ -475,7 +467,7 @@
- updated to 3.0rc9.
Revision 1.52 2001/06/28 14:56:54 blues
-3.0rc8pl2
+- 3.0rc8pl2
Revision 1.51 2001/06/22 12:07:16 kloczek
- updated to 3.0rc8,
@@ -484,12 +476,12 @@
Revision 1.50 2001/05/27 12:52:40 blues
- 3.0rc7
-STB
-NOTE: previous clients were vulnerable to a root attack by a corrupt DHCP
-server
+ STB
+ NOTE: previous clients were vulnerable to a root attack by a corrupt DHCP
+ server
Revision 1.49 2001/04/30 16:05:16 kloczek
-- added using %%{rpmcflags} macro.
+- added using %{rpmcflags} macro.
Revision 1.48 2001/02/19 18:06:39 mikrobi
- fixed dhcrelay/dhcp-relay dualism ;-). Now it boots-up fine
@@ -502,18 +494,17 @@
- Requires for rc-scripts changed to Prereq.
Revision 1.45 2001/01/25 20:03:22 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.44 2000/12/23 00:48:43 michuz
-- changed %%{!?debug:...}%%{?debug...} to %%{?debug:...}%%{!?debug...}
+- changed %{!?debug:...}%{?debug...} to %{?debug:...}%{!?debug...}
(now it's more C like)
Revision 1.43 2000/12/10 16:59:47 kloczek
-- now spec is %%{debug} ready.
+- now spec is %{debug} ready.
Revision 1.42 2000/12/10 16:17:32 misiek
-updated to 3.0b2pl11; removed reference to bind-devel
+- updated to 3.0b2pl11; removed reference to bind-devel
Revision 1.41 2000/10/06 07:48:08 kloczek
- release 2: adapterized and added using new automation suit.
@@ -531,7 +522,7 @@
- 3.0b1pl16
Revision 1.37 2000/06/09 07:22:49 kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
Revision 1.36 2000/05/18 17:35:47 kloczek
- spec adapterized.
@@ -605,7 +596,7 @@
Revision 1.16 1999/09/01 15:54:22 wiget
- added sysconfig file to dhcpd
-- added %%verify to sysconfig files
+- added %verify to sysconfig files
Revision 1.15 1999/09/01 01:35:14 kloczek
- release 3 (in rawhide is 2),
@@ -622,7 +613,7 @@
- added dhcrelay.sysconfig
Revision 1.12 1999/08/22 20:12:34 waszi
-separated to 3 packages
+- separated to 3 packages
Revision 1.11 1999/07/12 23:05:55 kloczek
- added using CVS keywords in %changelog (for automating them).
================================================================
Index: SPECS/distcc.spec
diff -u SPECS/distcc.spec:1.91 SPECS/distcc.spec:1.92
--- SPECS/distcc.spec:1.91 Mon May 2 20:23:51 2005
+++ SPECS/distcc.spec Fri Feb 24 16:35:49 2006
@@ -6,10 +6,10 @@
Summary: Program to distribute compilation of C or C++
Summary(pl): Program do rozdzielania kompilacji programów w C lub C++
Name: distcc
-Group: Development/Languages
Version: 2.18.3
Release: 1
License: GPL
+Group: Development/Languages
Source0: http://distcc.samba.org/ftp/distcc/%{name}-%{version}.tar.bz2
# Source0-md5: 0d6b80a1efc3a3d816c4f4175f63eaa2
Source1: %{name}.inetd
@@ -25,7 +25,7 @@
%{?with_gnome:BuildRequires: libgnomeui-devel >= 2.0}
BuildRequires: pkgconfig
BuildRequires: popt-devel
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -45,14 +45,14 @@
Summary: Common files for inetd and standalone versions of distcc
Summary(pl): Pliki wspólne dla wersji inetd i standalone distcc
Group: Daemons
-Requires: gcc
-Requires: gcc-c++
+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: gcc
+Requires: gcc-c++
Provides: group(distcc)
Provides: user(distcc)
Obsoletes: distcc < 2.1-2
@@ -73,8 +73,8 @@
Summary: inetd configs for distcc
Summary(pl): Pliki konfiguracyjne do użycia distcc poprzez inetd
Group: Daemons
-PreReq: %{name}-common = %{version}-%{release}
-PreReq: rc-inetd
+Requires: %{name}-common = %{version}-%{release}
+Requires: rc-inetd
Obsoletes: distcc < 2.1-2
%description inetd
@@ -87,9 +87,9 @@
Summary: Standalone daemon configs for distcc
Summary(pl): Pliki konfiguracyjne do startowania distcc w trybie standalone
Group: Daemons
-PreReq: %{name}-common = %{version}-%{release}
-PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
+Requires: %{name}-common = %{version}-%{release}
+Requires: rc-scripts
Obsoletes: distcc < 2.1-2
%description standalone
@@ -173,30 +173,18 @@
fi
%post inetd
-if [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd reload 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 [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd reload
-fi
+%service -q rc-inetd reload
%post standalone
/sbin/chkconfig --add distcc
-if [ -f /var/lock/subsys/distccd ]; then
- /etc/rc.d/init.d/distcc restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/distcc start\" to start distcc daemon."
-fi
+%service distcc restart "distcc daemon"
%preun standalone
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/distccd ]; then
- /etc/rc.d/init.d/distcc stop 1>&2
- fi
+ %service distcc stop
/sbin/chkconfig --del distcc
fi
@@ -242,6 +230,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.92 2006/02/24 15:35:49 glen
+- use %service
+
Revision 1.91 2005/05/02 18:23:51 glen
- adapterized
================================================================
Index: SPECS/dnsmasq.spec
diff -u SPECS/dnsmasq.spec:1.46 SPECS/dnsmasq.spec:1.47
--- SPECS/dnsmasq.spec:1.46 Sun Jan 15 15:39:36 2006
+++ SPECS/dnsmasq.spec Fri Feb 24 16:35:49 2006
@@ -11,8 +11,9 @@
Source1: %{name}.init
Source2: %{name}.config
URL: http://www.thekelleys.org.uk/dnsmasq/
-PreReq: rc-scripts
+BuildRequires: rpmbuild(macros) >= 1.268
Requires(post,postun): /sbin/chkconfig
+Requires: rc-scripts
Provides: caching-nameserver
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,17 +58,11 @@
%post
/sbin/chkconfig --add dnsmasq
-if [ -f %{_localstatedir}/lock/subsys/dnsmasq ]; then
- /etc/rc.d/init.d/dnsmasq restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/dnsmasq start\" to start dnsmasq." >&2
-fi
+%service dnsmasq restart
%preun
if [ "$1" = "0" ]; then
- if [ -f %{_localstatedir}/lock/subsys/dnsmasq ]; then
- /etc/rc.d/init.d/dnsmasq stop
- fi
+ %service dnsmasq stop
/sbin/chkconfig --del dnsmasq
fi
@@ -86,6 +81,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2006/02/24 15:35:49 glen
+- use %service
+
Revision 1.46 2006/01/15 14:39:36 areq
- 2.25
@@ -141,7 +139,7 @@
- updated to 2.8
Revision 1.28 2004/05/13 17:56:39 ankry
-- %%SOURCE# fixes
+- %SOURCE# fixes
Revision 1.27 2004/04/25 17:21:13 adamg
- updated to 2.7
@@ -153,7 +151,7 @@
- pl fix (pointed by Marcin Gajda), formatting
Revision 1.24 2004/03/18 18:31:09 domelu
-updated to 2.5
+- updated to 2.5
Revision 1.23 2004/03/13 15:33:30 adamg
- updated to 2.4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/dcd.spec?r1=1.79&r2=1.80&f=u
http://cvs.pld-linux.org/SPECS/ddclient.spec?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/SPECS/dhcp.spec?r1=1.109&r2=1.110&f=u
http://cvs.pld-linux.org/SPECS/distcc.spec?r1=1.91&r2=1.92&f=u
http://cvs.pld-linux.org/SPECS/dnsmasq.spec?r1=1.46&r2=1.47&f=u
More information about the pld-cvs-commit
mailing list