X-Git-Url: http://git.onelab.eu/?p=iproute2.git;a=blobdiff_plain;f=iproute.spec;h=734c6274f9e2473172ea6ac2280f1e750bd92da2;hp=ae4eb4ab04a589e36edd08e8208de577aaf9da9c;hb=HEAD;hpb=68698caf7ac3e3c25dd6b47f8363a49d0fdaa805 diff --git a/iproute.spec b/iproute.spec index ae4eb4a..734c627 100644 --- a/iproute.spec +++ b/iproute.spec @@ -1,11 +1,15 @@ %define name iproute -%define version 2.6.11 -%define release 1%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define version 2.6.38 +%define taglevel 1 + +%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} + +%define cbq_version v0.7.3 Vendor: PlanetLab Packager: PlanetLab Central -Distribution: PlanetLab 3.0 -URL: http://cvs.planet-lab.org/cvs/iptables +Distribution: PlanetLab %{plrelease} +URL: %{SCMURL} Summary: Advanced IP routing and network device configuration tools. Name: %{name} @@ -14,21 +18,12 @@ Release: %{release} Group: Applications/System #Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}-050314.tar.gz #URL: http://developer.osdl.org/dev/iproute2/ -Source: %{name}-%{version}.tar.gz -%define SOURCE1 ip.8 -%define SOURCE2 tc.8 -%define SOURCE3 tc-cbq.8 -%define SOURCE4 tc-cbq-details.8 -%define SOURCE5 tc-htb.8 -%define SOURCE6 tc-pbfifo.8 -%define SOURCE7 tc-pfifo_fast.8 -%define SOURCE8 tc-prio.8 -%define SOURCE9 tc-red.8 -%define SOURCE10 tc-sfq.8 -%define SOURCE11 tc-tbf.8 +Source: iproute2-%{version}.tar.bz2 +Patch1: gre.patch +Patch2: compile.patch License: GNU GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison +BuildRequires: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison flex %description The iproute package contains networking utilities (ip and rtmon, for @@ -36,11 +31,13 @@ example) which are designed to use the advanced networking capabilities of the Linux 2.4.x and 2.6.x kernel. %prep -%setup -q +%setup -q -n iproute2-%{version} +%patch1 -p1 +%patch2 -p1 %build make -make -C doc +#make -C doc %install #rm -rf $RPM_BUILD_ROOT @@ -50,23 +47,16 @@ mkdir -p $RPM_BUILD_ROOT/sbin \ $RPM_BUILD_ROOT%{_sbindir} \ $RPM_BUILD_ROOT%{_mandir}/man8 \ $RPM_BUILD_ROOT/etc/iproute2 \ - $RPM_BUILD_ROOT%{_libdir}/tc + $RPM_BUILD_ROOT%{_datadir}/tc \ install -m 755 ip/ip ip/ifcfg ip/rtmon tc/tc $RPM_BUILD_ROOT/sbin install -m 755 misc/ss misc/nstat misc/rtacct misc/lnstat misc/arpd $RPM_BUILD_ROOT%{_sbindir} -install -m 755 tc/q_netem.so $RPM_BUILD_ROOT%{_libdir}/tc -install -m 644 netem/normal.dist netem/pareto.dist netem/paretonormal.dist $RPM_BUILD_ROOT%{_libdir}/tc -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m 644 %{SOURCE9} $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/%{_mandir}/man8 -install -m 644 %{SOURCE11} $RPM_BUILD_ROOT/%{_mandir}/man8 +install -m 644 netem/normal.dist netem/pareto.dist netem/paretonormal.dist $RPM_BUILD_ROOT%{_datadir}/tc +install -m 644 man/man8/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8 +rm -r $RPM_BUILD_ROOT/%{_mandir}/man8/ss.8 +iconv -f latin1 -t utf8 < man/man8/ss.8 > $RPM_BUILD_ROOT/%{_mandir}/man8/ss.8 +install -m 755 examples/cbq.init-%{cbq_version} $RPM_BUILD_ROOT/sbin/cbq +install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cbq cp -f etc/iproute2/* $RPM_BUILD_ROOT/etc/iproute2 rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug/* @@ -79,14 +69,34 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug/* %defattr(-,root,root) %dir /etc/iproute2 %doc README.decnet README.iproute2+tc RELNOTES -%doc doc/*.ps examples +#%doc doc/*.ps +%doc examples /sbin/* %{_mandir}/man8/* %attr(644,root,root) %config(noreplace) /etc/iproute2/* %{_sbindir}/* -%{_libdir}/tc/* +%dir %{_datadir}/tc +%{_datadir}/tc/* %changelog +* Fri Oct 14 2011 Thierry Parmentelat - iproute2-2.6.38-1 +- remove spurious space + +* Mon Sep 26 2011 Thierry Parmentelat - iproute2-2.6.37-3 +- no functional change, just pull main tarball from our mirror + +* Fri Jun 10 2011 Thierry Parmentelat - iproute2-2.6.37-2 +- only a cleaner specfile + +* Tue Jun 07 2011 Thierry Parmentelat - iproute2-2.6.37-1 +- dont rebuild doc + +* Fri Apr 16 2010 S.Çağlar Onur - iproute2-2.6.33-2 +- Fix taglevel + +* Thu Jun 26 2008 Stephen Soltesz - iproute2-2.6.16-2 +- Should fix build error caused by new version of kernel headers.: + * Tue Mar 15 2005 Radek Vokal 2.6.11-1 - update to iproute-2.6.11