Merge commit 'origin/master'

diff --combined iproute.spec
index c1d2a34,b0b066a..19624c2
--- 1/iproute.spec
--- 2/iproute.spec
+++ b/iproute.spec
@@@ -1,10 -1,5 +1,5 @@@
- #
- # $Id$
- #
- %define url $URL$
- 
  %define name iproute
 -%define version 2.6.37
 +%define version 2.6.38
  %define taglevel 0
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@@ -14,7 -9,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}
@@@ -42,7 -37,7 +37,7 @@@ capabilities of the Linux 2.4.x and 2.6
  
  %build
  make
- make -C doc
+ #make -C doc
  
  %install
  #rm -rf $RPM_BUILD_ROOT
@@@ -74,7 -69,8 +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/*