packages: iproute2/iproute2.spec, iproute2/libnetlink.3 (REMOVED) - use lib...

[qboosh]

Author: qboosh                       Date: Fri Nov 25 17:46:29 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use libnetlink(3) man from sources (differs only by fixed typo)
- package tc-hfsc(7) man
- don't package arpd(8) manual as arpd is not packaged here

---- Files affected:
packages/iproute2:
   iproute2.spec (1.209 -> 1.210) , libnetlink.3 (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/iproute2/iproute2.spec
diff -u packages/iproute2/iproute2.spec:1.209 packages/iproute2/iproute2.spec:1.210
--- packages/iproute2/iproute2.spec:1.209	Thu Nov 24 19:25:47 2011
+++ packages/iproute2/iproute2.spec	Fri Nov 25 18:46:24 2011
@@ -22,7 +22,6 @@
 Group:		Networking/Admin
 Source0:	http://kernel.org/pub/linux/utils/networking/iproute2/%{name}-%{version}.tar.xz
 # Source0-md5:	810cdc0ddc2409a7af7089588c6c9a68
-Source1:	libnetlink.3
 Patch0:		%{name}-build.patch
 Patch1:		%{name}-arp.patch
 Patch3:		%{name}-iptables.patch
@@ -39,7 +38,7 @@
 BuildRequires:	bison
 BuildRequires:	db-devel
 BuildRequires:	flex
-BuildRequires:	iptables-devel >= 0:1.4.3
+BuildRequires:	iptables-devel >= 0:1.4.5
 %if %{with atm}
 BuildRequires:	linux-atm-devel
 %endif
@@ -61,6 +60,7 @@
 BuildRequires:	texlive-tex-babel
 %endif
 %endif
+Requires:	iptables-libs >= 0:1.4.5
 Obsoletes:	ifstat
 Obsoletes:	iproute
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -157,7 +157,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir},%{_mandir}/man{3,8},%{_libdir},%{_includedir},%{?with_tc:%{_libdir}/tc}}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir},%{_mandir}/man{3,7,8},%{_libdir},%{_includedir},%{?with_tc:%{_libdir}/tc}}
 
 install -p ip/{ip,rtmon,routel} %{?with_tc:tc/tc} misc/{ifstat,lnstat,nstat,rtacct,ss} $RPM_BUILD_ROOT%{_sbindir}
 cp -a etc/iproute2/rt_protos \
@@ -166,10 +166,13 @@
 	etc/iproute2/rt_tables \
 	$RPM_BUILD_ROOT%{_sysconfdir}
 
+cp -a man/man3/*	$RPM_BUILD_ROOT%{_mandir}/man3
+cp -a man/man7/*	$RPM_BUILD_ROOT%{_mandir}/man7
 cp -a man/man8/*	$RPM_BUILD_ROOT%{_mandir}/man8
 echo ".so tc-pbfifo.8" > $RPM_BUILD_ROOT%{_mandir}/man8/tc-bfifo.8
 echo ".so tc-pbfifo.8" > $RPM_BUILD_ROOT%{_mandir}/man8/tc-pfifo.8
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man3
+# arpd is not packaged here
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/arpd.8
 
 cp -a lib/libnetlink.a $RPM_BUILD_ROOT%{_libdir}
 cp -a include/libnetlink.h $RPM_BUILD_ROOT%{_includedir}
@@ -199,7 +202,6 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rt_realms
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rt_scopes
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rt_tables
-%{_mandir}/man8/arpd.8*
 %{_mandir}/man8/ip.8*
 %{_mandir}/man8/lnstat.8*
 %{_mandir}/man8/routel.8*
@@ -210,6 +212,7 @@
 %attr(755,root,root) %{_sbindir}/tc
 %dir %{_libdir}/tc
 %attr(755,root,root) %{_libdir}/tc/*.so
+%{_mandir}/man7/tc-hfsc.7*
 %{_mandir}/man8/tc.8*
 %{_mandir}/man8/tc-*.8*
 %endif
@@ -233,6 +236,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.210  2011/11/25 17:46:24  qboosh
+- use libnetlink(3) man from sources (differs only by fixed typo)
+- package tc-hfsc(7) man
+- don't package arpd(8) manual as arpd is not packaged here
+
 Revision 1.209  2011/11/24 18:25:47  arekm
 - up to 3.1.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iproute2/iproute2.spec?r1=1.209&r2=1.210&f=u