- pl, some cleanups

Changed files:
    dhcpv6.spec -> 1.2

diff --git a/dhcpv6.spec b/dhcpv6.spec
index 8d65517c655c58feb447d31dde882559d9ff2092..18f5aaa0995bf984bde9732d0721936275de66eb 100644 (file)
--- a/dhcpv6.spec
+++ b/dhcpv6.spec
@@ -1,18 +1,19 @@
 Summary:       DHCPv6 - DHCP server and client for IPv6
+Summary(pl):   DHCPv6 - serwer i klient DHCP dla IPv6
 Name:          dhcpv6
 Version:       0.10
 Release:       1
 License:       GPL
 Group:         Networking/Daemons
-URL:           http://dhcpv6.sourceforge.net/
-Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/d/dh/dhcp/dhcp-%{version}.tgz
+Source0:       http://dl.sourceforge.net/dhcp/dhcp-%{version}.tgz
 Source1:       rfc3315.txt
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Patch0:                %{name}-0.10-initscripts.patch
 Patch1:                %{name}-0.10-change_resolv_conf.patch
-Requires:      /sbin/chkconfig
-Requires:      /sbin/service
-BuildRequires: flex, bison
+URL:           http://dhcpv6.sourceforge.net/
+Requires(post,preun):  /sbin/chkconfig
+BuildRequires: bison
+BuildRequires: flex
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Implements the Dynamic Host Configuration Protocol (DHCP) for Internet
@@ -21,69 +22,85 @@ Dynamic Host Configuration Protocol for IPv6 (DHCPv6). Consists of
 dhcp6s(8), the server DHCP daemon. Install this if you want to support
 dynamic configuration of IPv6 addresses and parameters on your IPv6
 network. See man dhcp6s(8), dhcp6s.conf(5), and the documentation in
-/usr/share/dhcpv6* .
+/usr/share/doc/dhcpv6* .
+
+%description -l pl
+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). Nale¿y zainstalowaæ ten pakiet, je¶li potrzebujemy
+obs³ugi dynamicznej konfiguracji adresów i parametrów sieci IPv6.
+Wiêcej znajduje siê w manualach dhcp6s(8), dhcp6s.conf(5) oraz
+dokumentacji w /usr/share/doc/dhcpv6* .
 
 %prep
 %setup -q -n dhcp-%{version}
-%patch0 -p1 -b .initscripts
-%patch1 -p1 -b .change_resolv_conf
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
-       --prefix=\
+       --prefix= \
        --mandir=%{_mandir}
 %{__make}
 cp -fp %{SOURCE1} docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-rm -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-install -d %{buildroot}%{_localstatedir}/lib/dhcpv6
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/dhcpv6
 
 %package -n dhcpv6_client
-Summary:  DHCPv6 client
-Requires: initscripts >= 7.73
-Group: System Environment/Base
+Summary:       DHCPv6 client
+Summary(pl):   Klient DHCPv6
+Group:         Applications/Networking
+Requires:      initscripts >= 7.73
 
 %description -n dhcpv6_client
 Provides the client for the DHCPv6 protocol (RFC 3315) to support
 dynamic configuration of IPv6 addresses and parameters. See man
 dhcp6c(8), dhcp6c.conf(5), and the documentation in
-/usr/share/dhcpv6_client* .
+/usr/share/doc/dhcpv6_client* .
+
+%description -n dhcpv6_client -l pl
+Ten pakiet dostarcza klienta protoko³u DHCPv6 (RFC 3315) do obs³ugi
+dynamicznej konfiguracji adresów i parametrów sieci iPv6. Wiêcej
+znajduje siê w manualu dhcp6c(8), dhcp6c.conf(5) oraz dokumentacji w
+/usr/share/doc/dhcpv6_client*
 
 %post
-chkconfig --add dhcp6s
+/sbin/chkconfig --add dhcp6s
 
 %preun
-if [ $1 = 0 ]; then
-  service dhcp6s stop > /dev/null 2>&1
-  chkconfig --del dhcp6s
+if [ "$1" = "0" ]; then
+       /etc/rc.d/init.d/dhcp6s stop >/dev/null 2>&1
+       /sbin/chkconfig --del dhcp6s
 fi
 
 %postun
 if [ "$1" -ge "1" ]; then
-  service dhcp6s condrestart >/dev/null 2>&1
+       /etc/rc.d/init.d/dhcp6s condrestart >/dev/null 2>&1
 fi
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc ReadMe docs/* dhcp6s.conf
 %attr(754,root,root) %{_sbindir}/dhcp6s
 %attr(755,root,root) %config /etc/rc.d/init.d/dhcp6s
 %config(noreplace) /etc/sysconfig/dhcp6s
-%{_mandir}/man8/dhcp6s.8.gz
-%{_mandir}/man5/dhcp6s.conf.5.gz
+%{_mandir}/man8/dhcp6s.8*
+%{_mandir}/man5/dhcp6s.conf.5*
 %attr(754,root,root) %dir %{_localstatedir}/lib/dhcpv6
 
-%doc ReadMe docs/* dhcp6s.conf
-
 %files -n dhcpv6_client
 %defattr(644,root,root,755)
-%attr(750,root,root) /sbin/dhcp6c
-%{_mandir}/man8/dhcp6c.8.gz
-%{_mandir}/man5/dhcp6c.conf.5.gz
 %doc ReadMe dhcp6c.conf
+%attr(750,root,root) /sbin/dhcp6c
+%{_mandir}/man8/dhcp6c.8*
+%{_mandir}/man5/dhcp6c.conf.5*
 %attr(750,root,root) %dir %{_localstatedir}/lib/dhcpv6