X-Git-Url: http://git.onelab.eu/?p=iproute2.git;a=blobdiff_plain;f=iproute.spec;h=734c6274f9e2473172ea6ac2280f1e750bd92da2;hp=cdcba2b55ac7ddb495dbc60070c1268232b302c8;hb=HEAD;hpb=36cacc167184528768fe8c891426e77eb888ec18

diff --git a/iproute.spec b/iproute.spec
index cdcba2b..734c627 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 1
 
 %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}
@@ -25,9 +20,10 @@ Group: Applications/System
 #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
@@ -37,10 +33,11 @@ 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
@@ -72,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/*
@@ -81,6 +79,21 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug/*
 %{_datadir}/tc/*
 
 %changelog
+* Fri Oct 14 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - iproute2-2.6.38-1
+- remove spurious space
+
+* 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.: