packages: net-tools/net-tools.spec - GPL version, pl fixes, use __rm macro, ...

Wed Mar 16 16:57:08 CET 2011

Author: qboosh                       Date: Wed Mar 16 15:57:08 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- GPL version, pl fixes, use __rm macro, cleanups

---- Files affected:
packages/net-tools:
   net-tools.spec (1.93 -> 1.94) 

---- Diffs:

================================================================
Index: packages/net-tools/net-tools.spec
diff -u packages/net-tools/net-tools.spec:1.93 packages/net-tools/net-tools.spec:1.94

--- packages/net-tools/net-tools.spec:1.93	Fri Feb 11 08:30:10 2011
+++ packages/net-tools/net-tools.spec	Wed Mar 16 16:57:02 2011
@@ -11,7 +11,7 @@
 Name:		net-tools
 Version:	1.60
 Release:	32
-License:	GPL
+License:	GPL v2+
 Group:		Networking/Admin
 Source0:	http://download.berlios.de/net-tools/%{name}-%{version}.tar.bz2
 # Source0-md5:	888774accab40217dde927e21979c165
@@ -93,7 +93,7 @@
 
 %package -n slattach
 Summary:	slattach - attach a network interface to a serial line
-Summary(pl.UTF-8):	slattach - dołącz interfejs sieciowy do lini szeregowej
+Summary(pl.UTF-8):	slattach - dołączanie interfejsu sieciowego do linii szeregowej
 Group:		Networking/Admin
 Requires:	%{name} = %{version}-%{release}
 
@@ -104,8 +104,8 @@
 
 %description -n slattach -l pl.UTF-8
 Slattach jest prostym programem, który umożliwia zamianę zwykłej linii
-terminala ("szeregowej") w jeden z kilku trybów "sieciowych" przez co
-umożliwia na połączenia point-to-point z innym komputerem.
+terminala ("szeregowej") w jeden z kilku trybów "sieciowych", co
+pozwala na połączenia point-to-point z innym komputerem.
 
 %package -n plipconfig
 Summary:	plipconfig - fine tune PLIP device parameters
@@ -173,7 +173,7 @@
 	I18N=1
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-rm -f $RPM_BUILD_ROOT%{_mandir}/README.net-tools-non-english-man-pages
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.net-tools-non-english-man-pages
 
 # standardize localized man dirs
 mv -f $RPM_BUILD_ROOT%{_mandir}/{de_DE/man1/*,de/man1}
@@ -183,17 +183,17 @@
 # we can do it safely as no pt/pt_PT man pages appeared here yet
 mv $RPM_BUILD_ROOT%{_mandir}/{pt_BR,pt}
 
- #remove hostname (has its own package)
-rm $RPM_BUILD_ROOT/bin/dnsdomainname
-rm $RPM_BUILD_ROOT%{_mandir}/{,*/}man*/dnsdomainname*
-rm $RPM_BUILD_ROOT/bin/domainname
-rm $RPM_BUILD_ROOT%{_mandir}/{,*/}man*/domainname*
-rm $RPM_BUILD_ROOT/bin/hostname
-rm $RPM_BUILD_ROOT%{_mandir}/{,*/}man*/hostname*
-rm $RPM_BUILD_ROOT/bin/nisdomainname
-rm $RPM_BUILD_ROOT%{_mandir}/{,*/}man*/nisdomainname*
-rm $RPM_BUILD_ROOT/bin/ypdomainname
-rm $RPM_BUILD_ROOT%{_mandir}/{,*/}man*/ypdomainname*
+# remove hostname (has its own package)
+%{__rm} $RPM_BUILD_ROOT/bin/dnsdomainname
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/dnsdomainname*
+%{__rm} $RPM_BUILD_ROOT/bin/domainname
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/domainname*
+%{__rm} $RPM_BUILD_ROOT/bin/hostname
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/hostname*
+%{__rm} $RPM_BUILD_ROOT/bin/nisdomainname
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/nisdomainname*
+%{__rm} $RPM_BUILD_ROOT/bin/ypdomainname
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/ypdomainname*
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/mactab <<EOF
 # Each line here contains an interface name and a Ethernet MAC address. Like:
@@ -207,9 +207,9 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc READ*
+%doc README README.ipv6 TODO
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mactab
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/netstat
 %attr(755,root,root) %{_sbindir}/arp
 %attr(755,root,root) %{_sbindir}/ifconfig
 %attr(755,root,root) %{_sbindir}/mii-tool
@@ -217,31 +217,28 @@
 %attr(755,root,root) %{_sbindir}/route
 %attr(755,root,root) %{_sbindir}/nameif
 
-%lang(de) %{_mandir}/de/man[15]/*
+%lang(de) %{_mandir}/de/man5/ethers.5*
 %lang(de) %{_mandir}/de/man8/[!ps]*
-%lang(es) %{_mandir}/es/man[15]/*
+%lang(es) %{_mandir}/es/man5/ethers.5*
 %lang(es) %{_mandir}/es/man8/[!ps]*
-#%lang(fi) %{_mandir}/fi/man[15]/*
-# No fi man8
-%lang(fr) %{_mandir}/fr/man[15]/*
+%lang(fr) %{_mandir}/fr/man5/ethers.5*
 %lang(fr) %{_mandir}/fr/man8/[!ps]*
-#%lang(hu) %{_mandir}/hu/man[15]/*
 %lang(hu) %{_mandir}/hu/man8/[!ps]*
-#%lang(id) %{_mandir}/id/man[15]/*
 %lang(id) %{_mandir}/id/man8/[!ps]*
-#%lang(it) %{_mandir}/it/man[15]/*
 %lang(it) %{_mandir}/it/man8/[!ps]*
-%lang(ja) %{_mandir}/ja/man[15]/*
+%lang(ja) %{_mandir}/ja/man5/ethers.5*
 %lang(ja) %{_mandir}/ja/man8/[!ps]*
-# No nl man[15]
 %lang(nl) %{_mandir}/nl/man8/[!ps]*
-#%lang(pt) %{_mandir}/pt/man[15]/*
 %lang(pt) %{_mandir}/pt/man8/[!ps]*
-#%lang(pl) %{_mandir}/pl/man[15]/*
 %lang(pl) %{_mandir}/pl/man8/[!ps]*
-
-%{_mandir}/man[15]/*
-%{_mandir}/man8/[!ps]*
+%{_mandir}/man5/ethers.5*
+%{_mandir}/man8/arp.8*
+%{_mandir}/man8/ifconfig.8*
+%{_mandir}/man8/mii-tool.8*
+%{_mandir}/man8/nameif.8*
+%{_mandir}/man8/netstat.8*
+%{_mandir}/man8/rarp.8*
+%{_mandir}/man8/route.8*
 
 %files -n slattach
 %defattr(644,root,root,755)
@@ -266,6 +263,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2011/03/16 15:57:02  qboosh
+- GPL version, pl fixes, use __rm macro, cleanups
+
 Revision 1.93  2011/02/11 07:30:10  arekm
 - rel 32; hostname/domainname tools in separate hostname.spec
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-tools/net-tools.spec?r1=1.93&r2=1.94&f=u

