- rel 2; use make install; package more utilities and config files

diff --git a/iproute2.spec b/iproute2.spec
index 060091f68f664d5146e9c235d827effaaf6c6483..69146a30a68b8354c9bf53c75e2dc1ef82629bd8 100644 (file)
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -16,7 +16,7 @@ Summary(pl.UTF-8):    Narzędzie do konfigurowania sieci
 Summary(pt_BR.UTF-8):  Ferramentas para roteamento avançado e configuração de interfaces de rede
 Name:          iproute2
 Version:       3.5.1
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Networking/Admin
 Source0:       http://kernel.org/pub/linux/utils/net/iproute2/%{name}-%{version}.tar.xz
@@ -150,30 +150,18 @@ Dokumentacja do iproute zawiera "howto" oraz przykłady ustawień.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-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}
-ln -s lnstat $RPM_BUILD_ROOT%{_sbindir}/ctstat
-ln -s lnstat $RPM_BUILD_ROOT%{_sbindir}/rtstat
-cp -a etc/iproute2/rt_protos \
-       etc/iproute2/rt_realms \
-       etc/iproute2/rt_scopes \
-       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 lnstat.8" > $RPM_BUILD_ROOT%{_mandir}/man8/ctstat.8
-echo ".so lnstat.8" > $RPM_BUILD_ROOT%{_mandir}/man8/rtstat.8
-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
+
+install -d $RPM_BUILD_ROOT%{_includedir}
+
+%{__make} install \
+       LIBDIR=%{_libdir} \
+       DESTDIR=$RPM_BUILD_ROOT
+
 # arpd is not packaged here
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/arpd.8
+%{__rm} $RPM_BUILD_ROOT%{_sbindir}/arpd $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}
-%{?with_tc:install -p tc/*.so $RPM_BUILD_ROOT%{_libdir}/tc}
 
 %if %{with doc}
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -186,17 +174,25 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README README.decnet README.iproute2+tc README.distribution README.lnstat
+%attr(755,root,root) %{_sbindir}/bridge
 %attr(755,root,root) %{_sbindir}/ctstat
+%attr(755,root,root) %{_sbindir}/genl
+%attr(755,root,root) %{_sbindir}/ifcfg
 %attr(755,root,root) %{_sbindir}/ifstat
 %attr(755,root,root) %{_sbindir}/ip
 %attr(755,root,root) %{_sbindir}/lnstat
 %attr(755,root,root) %{_sbindir}/nstat
+%attr(755,root,root) %{_sbindir}/routef
 %attr(755,root,root) %{_sbindir}/routel
 %attr(755,root,root) %{_sbindir}/rtacct
 %attr(755,root,root) %{_sbindir}/rtmon
+%attr(755,root,root) %{_sbindir}/rtpr
 %attr(755,root,root) %{_sbindir}/rtstat
 %attr(755,root,root) %{_sbindir}/ss
 %dir %{_sysconfdir}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ematch_map
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/group
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rt_dsfield
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rt_protos
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rt_realms
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rt_scopes
@@ -217,7 +213,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/tc
 %dir %{_libdir}/tc
 %attr(755,root,root) %{_libdir}/tc/*.so
-%{_mandir}/man7/tc-hfsc.7*
+%{_libdir}/tc/*.dist
 %{_mandir}/man8/tc.8*
 %{_mandir}/man8/tc-*.8*
 %endif