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

diff --git a/iproute.spec b/iproute.spec
index 89a6dca..e2a34bb 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,11 +1,6 @@
-#
-# $Id$
-#
-%define url $URL$
-
 %define name iproute
-%define version 2.6.33
-%define taglevel 2
+%define version 2.6.38
+%define taglevel 0
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -14,7 +9,7 @@
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 Summary: Advanced IP routing and network device configuration tools.
 Name: %{name}
@@ -24,9 +19,11 @@ Group: Applications/System
 #Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}-050314.tar.gz
 #URL:    http://developer.osdl.org/dev/iproute2/
 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 flex
+BuildRequires: tetex-latex tetex-dvips psutils linuxdoc-tools db4-devel bison flex
 
 %description
 The iproute package contains networking utilities (ip and rtmon, for
@@ -35,10 +32,12 @@ capabilities of the Linux 2.4.x and 2.6.x kernel.
 
 %prep
 %setup -q -n iproute2-%{version}
+%patch1 -p1
+%patch2 -p1
 
 %build
 make
-make -C doc
+#make -C doc
 
 %install
 #rm -rf $RPM_BUILD_ROOT
@@ -70,7 +69,8 @@ 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/*
@@ -79,6 +79,18 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug/*
 %{_datadir}/tc/*
 
 %changelog
+* Mon Sep 26 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - iproute2-2.6.37-3
+- no functional change, just pull main tarball from our mirror
+
+* Fri Jun 10 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - iproute2-2.6.37-2
+- only a cleaner specfile
+
+* Tue Jun 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - iproute2-2.6.37-1
+- dont rebuild doc
+
+* Fri Apr 16 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - iproute2-2.6.33-2
+- Fix taglevel
+
 * 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.: