- subpkg for relay daemon, server (to be summetric)

Changed files:
    dhcpv6.spec -> 1.33

diff --git a/dhcpv6.spec b/dhcpv6.spec
index 37b23a5aff7e5494a0cbec6f088e8ebb572f82b6..e568e5b51884554f06c8d78c3c47ccd827557e58 100644 (file)
--- a/dhcpv6.spec
+++ b/dhcpv6.spec
@@ -1,10 +1,8 @@
-# TODO:
-# - subpackage for relay daemon
 Summary:       DHCPv6 - DHCP server and client for IPv6
 Summary(pl.UTF-8):     DHCPv6 - serwer i klient DHCP dla IPv6
 Name:          dhcpv6
 Version:       1.0.15
-Release:       0.1
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         Networking/Daemons
@@ -20,37 +18,52 @@ BuildRequires:      bison
 BuildRequires: flex
 BuildRequires: libtool
 BuildRequires: rpmbuild(macros) >= 1.268
-Requires(post,preun):  /sbin/chkconfig
-Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Implements the Dynamic Host Configuration Protocol (DHCP) for Internet
 Protocol version 6 (IPv6) networks in accordance with RFC 3315:
-Dynamic Host Configuration Protocol for IPv6 (DHCPv6). Consists of
-dhcp6s(8), the server DHCP daemon.
+Dynamic Host Configuration Protocol for IPv6 (DHCPv6).
 
 %description -l pl.UTF-8
 Ten pakiet jest implementacją protokołu Dynamic Host Configuration
 Protocol (DHCP) dla sieci IPv6 zgodnie z RFC 3315: Dynamic Host
-Configuration Protocol for IPv6 (DHCPv6). Zawiera demona serwera DHCP
-dhcp6s(8).
+Configuration Protocol for IPv6 (DHCPv6).
 
-%package -n dhcpv6-client
+%package client
 Summary:       DHCPv6 client
 Summary(pl.UTF-8):     Klient DHCPv6
 Group:         Applications/Networking
 Requires(post,preun):  /sbin/chkconfig
 Requires:      rc-scripts
 
-%description -n dhcpv6-client
+%description client
 Provides the client for the DHCPv6 protocol (RFC 3315) to support
 dynamic configuration of IPv6 addresses and parameters.
 
-%description -n dhcpv6-client -l pl.UTF-8
+%description client -l pl.UTF-8
 Ten pakiet dostarcza klienta protokołu DHCPv6 (RFC 3315) do obsługi
 dynamicznej konfiguracji adresów i parametrów sieci iPv6.
 
+%package relay
+Summary:       DHCPv6 relay agent
+Group:         Applications/Networking
+Requires(post,preun):  /sbin/chkconfig
+Requires:      rc-scripts
+
+%description relay
+dhcp6r acts as DHCPv6 relay agent forwarding DHCPv6 messages from
+clients to servers and vice versa.
+
+%package server
+Summary:       DHCPv6 server daemon
+Group:         Applications/Networking
+Requires(post,preun):  /sbin/chkconfig
+Requires:      rc-scripts
+
+%description server
+dhcp6s is an implementation of the DHCPv6 server.
+
 %package -n libdhcp6client
 Summary:       The DHCPv6 client in a library for invocation by other programs
 Summary(pl.UTF-8):     Klient DHCPv6 w postaci biblioteki do wykorzystania w innych programach
@@ -119,55 +132,64 @@ install %{SOURCE2}        $RPM_BUILD_ROOT/etc/rc.d/init.d/dhcp6c
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/chkconfig --add dhcp6s
-%service dhcp6s restart
+%post client
+/sbin/chkconfig --add dhcp6c
+%service dhcp6c restart
+
+%post relay
 /sbin/chkconfig --add dhcp6r
 %service dhcp6r restart
 
-%preun
+%post server
+/sbin/chkconfig --add dhcp6s
+%service dhcp6s restart
+
+%preun client
+if [ "$1" = "0" ]; then
+       %service dhcp6c stop
+       /sbin/chkconfig --del dhcp6c
+fi
+
+%preun relay
 if [ "$1" = "0" ]; then
-       %service dhcp6s stop
-       /sbin/chkconfig --del dhcp6s
        %service dhcp6r stop
        /sbin/chkconfig --del dhcp6r
 fi
 
-%post -n dhcpv6-client
-/sbin/chkconfig --add dhcp6c
-%service dhcp6c restart
-
-%preun -n dhcpv6-client
+%preun server
 if [ "$1" = "0" ]; then
-       %service dhcp6c stop
-       /sbin/chkconfig --del dhcp6c
+       %service dhcp6s stop
+       /sbin/chkconfig --del dhcp6s
 fi
 
 %post  -n libdhcp6client -p /sbin/ldconfig
 %postun        -n libdhcp6client -p /sbin/ldconfig
 
-%files
+%files client
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/dhcp6c
+%attr(754,root,root) /etc/rc.d/init.d/dhcp6c
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dhcp6c.conf
+%{_mandir}/man8/dhcp6c.8*
+%{_mandir}/man5/dhcp6c.conf.5*
+
+%files relay
 %defattr(644,root,root,755)
-%doc AUTHORS README TODO
 %attr(755,root,root) %{_sbindir}/dhcp6r
-%attr(755,root,root) %{_sbindir}/dhcp6s
 %attr(754,root,root) /etc/rc.d/init.d/dhcp6r
-%attr(754,root,root) /etc/rc.d/init.d/dhcp6s
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dhcp6r
+%{_mandir}/man8/dhcp6r.8*
+
+%files server
+%defattr(644,root,root,755)
+%doc AUTHORS README TODO
+%attr(755,root,root) %{_sbindir}/dhcp6s
+%attr(754,root,root) /etc/rc.d/init.d/dhcp6s
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dhcp6s
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dhcp6s.conf
-%attr(750,root,root) %dir %{_localstatedir}/lib/dhcpv6
-%{_mandir}/man8/dhcp6r.8*
 %{_mandir}/man8/dhcp6s.8*
 %{_mandir}/man5/dhcp6s.conf.5*
-
-%files -n dhcpv6-client
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/dhcp6c
-%attr(754,root,root) /etc/rc.d/init.d/dhcp6c
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dhcp6c.conf
-%{_mandir}/man8/dhcp6c.8*
-%{_mandir}/man5/dhcp6c.conf.5*
+%attr(750,root,root) %dir %{_localstatedir}/lib/dhcpv6
 
 %files -n libdhcp6client
 %defattr(644,root,root,755)