From cb2b55f98b9b8e1ec1f0e691448c95f22b01802faaad9afb985bd7d159255287 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 31 May 2011 22:54:51 +0000
Subject: [PATCH] run spec-beautifier

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=28
---
 iproute2.changes |  1 +
 iproute2.spec    | 54 ++++++++++++++++++++++++------------------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/iproute2.changes b/iproute2.changes
index 776f246..bad2200 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -4,6 +4,7 @@ Tue May 31 21:35:16 UTC 2011 - jengelh@medozas.de
 - Correct installation path of tc modules
 - Restore symbol lookup in m_xt.so (bnc#660554, bnc#679172)
 - Add patches to make m_xt build with libxtables6
+- Run spec-beautifier
 
 -------------------------------------------------------------------
 Mon May 30 11:50:56 UTC 2011 - jengelh@medozas.de
diff --git a/iproute2.spec b/iproute2.spec
index f9df068..7e6987e 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -26,7 +26,7 @@ Version:        2.6.38
 Release:        2
 %define rversion        2.6.38
 Summary:        Advanced Routing
-Url:            http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
+URL:            http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
 Source0:        %name-%rversion.tar.bz2
 Patch0:         %name-libdir-1.diff
 Patch1:         %name-HZ.diff
@@ -34,8 +34,8 @@ Patch2:         %name-pdfdoc.diff
 Patch3:         %name-memleak.diff
 Patch4:		iproute2-xt.diff
 Patch5:		iproute2-libxtables6.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  bison db-devel flex ghostscript-fonts-std ghostscript-x11 libpng-devel libtiff-devel sgmltool texlive-latex xorg-x11-devel
+BuildRoot:      %_tmppath/%name-%version-build
+BuildRequires:  bison, db-devel, flex, ghostscript-fonts-std, ghostscript-x11, libpng-devel, libtiff-devel, sgmltool, texlive-latex, xorg-x11-devel
 %define with_xt 1
 %if 0%{?with_xt}
 BuildRequires:  iptables-devel
@@ -85,44 +85,44 @@ find . -name *.orig -print0 | xargs -r0 rm -v
 %build
 # build with -fPIC. For details see
 # https://bugzilla.novell.com/show_bug.cgi?id=388021
-make %{?_smp_mflags} LIBDIR=%_libdir CCOPTS="-D_GNU_SOURCE $RPM_OPT_FLAGS -Wstrict-prototypes -fPIC"
+make %{?_smp_mflags} LIBDIR=%_libdir CCOPTS="-D_GNU_SOURCE %optflags -Wstrict-prototypes -fPIC"
 cd doc
 make pdf
 
 %install
-install -d $RPM_BUILD_ROOT/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}}
-install -d $RPM_BUILD_ROOT/{/usr/include,%_libdir,/usr/share}
-make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir \
-	MODDESTDIR="$RPM_BUILD_ROOT/%_libdir/tc"
+install -d %buildroot/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}}
+install -d %buildroot/{/usr/include,%_libdir,/usr/share}
+make install DESTDIR=%buildroot LIBDIR=%_libdir \
+	MODDESTDIR="%buildroot/%_libdir/tc"
 # We have m_xt
-rm -f "$RPM_BUILD_ROOT/%_libdir/tc/m_ipt.so"
-install lib/libnetlink.a $RPM_BUILD_ROOT/%_libdir
-install include/libnetlink.h $RPM_BUILD_ROOT/usr/include
-mv $RPM_BUILD_ROOT/usr/sbin/ip $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/bin
-ln -sf /sbin/ip $RPM_BUILD_ROOT/bin/ip
-rm $RPM_BUILD_ROOT/usr/sbin/ifcfg
+rm -f "%buildroot/%_libdir/tc/m_ipt.so"
+install lib/libnetlink.a %buildroot/%_libdir
+install include/libnetlink.h %buildroot%_includedir
+mv %buildroot%_sbindir/ip %buildroot/sbin
+mkdir -p %buildroot/bin
+ln -sf /sbin/ip %buildroot/bin/ip
+rm %buildroot%_sbindir/ifcfg
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %buildroot
 
 %files
 %defattr(-,root,root)
 %doc README* RELNOTES
-/usr/sbin/*
+%_sbindir/*
 /sbin/*
 /bin/ip
 %_mandir/man8/*
-%dir /etc/iproute2
-%config(noreplace) /etc/iproute2/rt_dsfield
-%config(noreplace) /etc/iproute2/rt_protos
-%config(noreplace) /etc/iproute2/rt_scopes
-%config(noreplace) /etc/iproute2/rt_realms
-%config(noreplace) /etc/iproute2/rt_tables
-%config(noreplace) /etc/iproute2/ematch_map
+%dir %_sysconfdir/iproute2
+%config(noreplace) %_sysconfdir/iproute2/rt_dsfield
+%config(noreplace) %_sysconfdir/iproute2/rt_protos
+%config(noreplace) %_sysconfdir/iproute2/rt_scopes
+%config(noreplace) %_sysconfdir/iproute2/rt_realms
+%config(noreplace) %_sysconfdir/iproute2/rt_tables
+%config(noreplace) %_sysconfdir/iproute2/ematch_map
 %_libdir/tc
-%dir /usr/share/tc
-%attr(644,root,root)/usr/share/tc/*
+%dir %_datadir/tc
+%attr(644,root,root)%_datadir/tc/*
 
 %files doc
 %defattr(-,root,root)
@@ -132,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libnetlink-devel
 %defattr(-,root,root)
-/usr/include/*
+%_includedir/*
 %_mandir/man3/libnetlink*
 %_libdir/lib*