X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=iproute.spec;h=89a6dca238979c49c53915d440304d328bf8143a;hb=3331a68859fd71047bb1f309048960b48eab2d83;hp=5bc4aa81634578822da2506848abbdbc86a1df00;hpb=77c82b1b3d5092cc7ece1e9c82b73d9c6f457803;p=iproute2.git

diff --git a/iproute.spec b/iproute.spec
index 5bc4aa8..89a6dca 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,13 +1,15 @@
 #
-# $Id: myplc.spec 7268 2007-12-01 00:09:11Z dhozac $
+# $Id$
 #
 %define url $URL$
 
 %define name iproute
-%define version 2.6.16
-%define subversion 1
+%define version 2.6.33
+%define taglevel 2
 
-%define release %{subversion}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+
+%define cbq_version v0.7.3
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -21,18 +23,7 @@ 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
 License: GNU GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison flex
@@ -43,7 +34,7 @@ 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}
 
 %build
 make
@@ -57,23 +48,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/*
@@ -91,9 +75,13 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug/*
 %{_mandir}/man8/*
 %attr(644,root,root) %config(noreplace) /etc/iproute2/*
 %{_sbindir}/*
-%{_libdir}/tc/*
+%dir %{_datadir}/tc
+%{_datadir}/tc/*
 
 %changelog
+* Thu Jun 26 2008 Stephen Soltesz <soltesz@cs.princeton.edu> - iproute2-2.6.16-2
+- Should fix build error caused by new version of kernel headers.:
+
 * Tue Mar 15 2005 Radek Vokal <rvokal@redhat.com> 2.6.11-1
 - update to iproute-2.6.11