From 1c453ae648616f76f4583c74ae9cee20a801db58591192b2adbff2d897c9ef5e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 15 Jul 2015 14:41:53 +0000 Subject: [PATCH] clean that up OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=107 --- iproute2-doc.spec | 20 ++++++++++---------- iproute2.spec | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/iproute2-doc.spec b/iproute2-doc.spec index a57d788..b9b84d2 100644 --- a/iproute2-doc.spec +++ b/iproute2-doc.spec @@ -67,19 +67,19 @@ cd doc make pdf %install -make install DESTDIR="%{buildroot}" LIBDIR="%_libdir" \ +make install DESTDIR="%buildroot" LIBDIR="%_libdir" \ MODDESTDIR="$b/%_libdir/tc" DOCDIR="%_docdir/iproute2" -mkdir -p "%{buildroot}/%_docdir/iproute2"; -cp -an ip/{ifcfg,routef,routel} doc/*.pdf "%{buildroot}/%_docdir/iproute2/" +mkdir -p "%buildroot/%_docdir/iproute2"; +cp -an ip/{ifcfg,routef,routel} doc/*.pdf "%buildroot/%_docdir/iproute2/" -t=$$ -mkdir $t -mv %{buildroot}/%_docdir $t -rm -rf %{buildroot}/* -mkdir -p %{buildroot}/%_docdir -mv $t/packages/* %{buildroot}/%_docdir -rm -rf $t +t="$$" +mkdir "$t" +mv "%buildroot/%_docdir" "$t/" +rm -rf "%buildroot"/* +mkdir -p "%buildroot/%_docdir" +mv "$t/packages"/* "%buildroot/%_docdir" +rm -rf "$t" %files %defattr(-,root,root) diff --git a/iproute2.spec b/iproute2.spec index df3173a..2d05c1f 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -28,7 +28,7 @@ Url: http://www.linuxfoundation.org/collaborate/workgroups/networking #DL-URL: http://kernel.org/pub/linux/utils/net/iproute2/ #Git-Clone: git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2 -Source: http://kernel.org/pub/linux/utils/net/iproute2/%{name}-%{version}.tar.xz +Source: http://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.xz Source2: http://kernel.org/pub/linux/utils/net/iproute2/%name-%rversion.tar.sign Source666: pre_checkin.sh Source667: %name.keyring