diff --git a/.cvsignore b/.cvsignore index 9f8eafb..53b8460 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -dhcp-2.0.tar.gz +dhcp-2.0pl5.tar.gz diff --git a/dhcp.spec b/dhcp.spec index c315c09..d30c07e 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -1,16 +1,16 @@ Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Epoch: 1 -Version: 2.0 -Release: 12 +Version: 2.0pl5 +Release: 4 Copyright: distributable Group: System Environment/Daemons Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz Source1: dhcpd.conf.sample Source2: dhcpd.init -Patch0: dhcp-%{version}-buildroot.patch -Patch1: dhcp-%{version}-js.patch -Patch2: dhcp-%{version}-unaligned.patch +Patch0: dhcp-2.0-buildroot.patch +Patch1: dhcp-2.0-js.patch +Patch2: dhcp-2.0-unaligned.patch Obsoletes: dhcpd BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -28,7 +28,7 @@ the DHCP client daemon, on client machines. %prep %setup -q -%patch0 -p1 -b .ewt +%patch0 -p1 %patch1 -p1 -b .js %ifarch sparc sparc64 alpha %patch2 -p1 -b .unaligned @@ -93,6 +93,19 @@ fi #/usr/man/man8/dhclient-script.8 %changelog +* Wed Feb 14 2001 Tim Waugh +- Fix initscript typo (bug #27624). + +* Wed Feb 7 2001 Trond Eivind Glomsr�d +- Improve spec file i18n + +* Mon Feb 5 2001 Bernhard Rosenkraenzer +- i18nize init script (#26084) + +* Sun Sep 10 2000 Florian La Roche +- update to 2.0pl5 +- redo buildroot patch + * Wed Aug 30 2000 Matt Wilson - rebuild to cope with glibc locale binary incompatibility, again diff --git a/dhcpd.init b/dhcpd.init index c34dfe7..3fbfe86 100644 --- a/dhcpd.init +++ b/dhcpd.init @@ -20,10 +20,11 @@ [ -f /var/lib/dhcp/dhcpd.leases ] || exit 0 RETVAL=0 +prog="dhcpd" start() { # Start daemons. - echo -n "Starting dhcpd: " + echo -n $"Starting $prog: " daemon /usr/sbin/dhcpd RETVAL=$? echo @@ -33,7 +34,7 @@ start() { stop() { # Stop daemons. - echo -n "Shutting down dhcpd: " + echo -n $"Shutting down $prog: " killproc dhcpd RETVAL=$? echo @@ -66,7 +67,7 @@ case "$1" in RETVAL=$? ;; *) - echo "Usage: dhcpd {start|stop|restart|condrestart|status}" + echo $"Usage: $0 {start|stop|restart|condrestart|status}" exit 1 esac diff --git a/sources b/sources index 751fe9d..8838f29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eff5d5359a50f878e4c0da082bf10475 dhcp-2.0.tar.gz +ab22f363a7aff924e2cc9d1019a21498 dhcp-2.0pl5.tar.gz