- updated to final 3.0 (Epoch: 2).

[packages/dhcp.git] / dhcp.spec

diff --git a/dhcp.spec b/dhcp.spec
index e39951a7ee85b58cb67970a8603747e8bd7804fd..c8780ec030912d146823dd1ed3a0456263cafa73 100644 (file)
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -1,14 +1,14 @@
 Summary:       DHCP Server 
 Summary(pl):   Serwer DHCP 
 Name:          dhcp
-Version:       3.0b2pl16
+Version:       3.0
 Release:       1
-Epoch:         1
+Epoch:         2
+Vendor:                ISC
+License:       Distributable
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
-Copyright:     distributable
-Vendor:                ISC
 Source0:       ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
 Source1:       %{name}.init
 Source2:       %{name}-relay.init
@@ -16,9 +16,9 @@ Source3:      %{name}-relay.sysconfig
 Source4:       %{name}d.conf.sample
 Source5:       %{name}.sysconfig
 BuildRequires: groff
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Prereq:                rc-scripts >= 0.2.0
 Prereq:                /sbin/chkconfig
-Prereq:                        rc-scripts >= 0.2.0
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
@@ -30,6 +30,11 @@ easier to administer a large network.
 %description -l pl
 Serwer DHCP (Dynamic Host Configuration Protocol).
 
+DHCP to protokó³ pozwalaj±cy urz±dzeniom pracuj±cym w sieci IP na
+pobieranie ich konfiguracji IP (adresu, maski podsieci, adresu
+rozg³oszeniowego itp.) z serwera DHCP. U³atwia on administrowanie
+du¿ymi sieciami IP.
+
 %package client
 Summary:       DHCP Client
 Summary(pl):   Klient DHCP 
@@ -50,7 +55,8 @@ Summary(pl):  Agent przekazywania informacji DHCP
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
-Requires:      rc-scripts >= 0.2.0
+Prereq:                rc-scripts >= 0.2.0
+Prereq:                /sbin/chkconfig
 
 %description relay
 Dhcp relay is a relay agent for DHCP packets. It is used on a subnet
@@ -61,7 +67,9 @@ this for the client.
 
 %description -l pl relay
 Agent przekazywania DHCP (Dynamic Host Configuration Protocol) miêdzy
-podsieciami.
+podsieciami. Poniewa¿ komunikaty DHCP mog± byæ przekazywane w formie
+rozg³oszeniowej, bez tego agenta nie zostan± przerutowane do innej 
+podsieci.
 
 %prep
 %setup -q
@@ -69,17 +77,17 @@ install %{SOURCE4} .
 
 %build
 # Notice: this is not autoconf configure!!!!!!!
-#         do not change it to %configure
+#         do not change it to %%configure
 ./configure
 
-%{__make} COPTS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS} \
+%{__make} COPTS="%{rpmcflags} \
        -D_PATH_DHCPD_DB=\\\"/var/lib/%{name}/dhcpd.leases\\\" \
        -D_PATH_DHCLIENT_DB=\\\"/var/lib/%{name}/dhclient.leases\\\"" \
        DEBUG="" VARDB="/var/lib/%{name}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/sbin,%{_sbindir},%{_mandir}/man{5,8}} \
+install -d $RPM_BUILD_ROOT{/sbin,%{_sbindir},%{_bindir},%{_mandir}/man{5,8}} \
        $RPM_BUILD_ROOT{/var/lib/%{name},%{_sysconfdir}/{rc.d/init.d,sysconfig}}
 
 %{__make} install \
@@ -103,6 +111,9 @@ gzip -9nf doc/* README RELNOTES
 
 touch $RPM_BUILD_ROOT/var/lib/%{name}/{dhcpd,dhclient}.leases
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post
 /sbin/chkconfig --add dhcpd
 touch /var/lib/%{name}/dhcpd.leases
@@ -118,12 +129,14 @@ else
 fi
 
 %post relay
-/sbin/chkconfig --add dhcrelay
-
+/sbin/chkconfig --add dhcp-relay
 if [ -f /var/lock/subsys/dhcrelay ]; then
-       /etc/rc.d/init.d/dhcrelay restart >&2
+       mv /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/dhcrelay start\" to start dhcrelay daemon."
+       echo "Run \"/etc/rc.d/init.d/dhcp-relay start\" to start dhcrelay daemon."
 fi
 
 %post client
@@ -141,14 +154,19 @@ fi
 
 %preun relay
 if [ "$1" = "0" ];then
-       if [ -f /var/lock/subsys/dhcrelay ]; then
-               /etc/rc.d/init.d/dhrelay stop >&2
+       if [ -f /var/lock/subsys/dhcp-relay ]; then
+               /etc/rc.d/init.d/dhcp-relay stop >&2
        fi
-       /sbin/chkconfig --del dhcrelay
+       /sbin/chkconfig --del dhcp-relay
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%triggerpostun -- dhcp < 3.0
+if [ `grep ddns-update-style /etc/dhcpd.conf` = "" ]; then
+       echo "ddns-update-style none;" > /etc/dhcpd.conf.tmp
+       echo "" >> /etc/dhcpd.conf.tmp
+       cat /etc/dhcpd.conf >>/etc/dhcpd.conf.tmp
+       mv -f /etc/dhcpd.conf.tmp /etc/dhcpd.conf
+fi
 
 %files
 %defattr(644,root,root,755)