From bc40ac0526066782bd2195d031e8ea45c2595ec0ef5e23ae2d7c47ead0afc8d5 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Thu, 9 Apr 2015 08:04:58 +0000
Subject: [PATCH] Accepting request 294294 from
 home:pluskalm:branches:Base:System

- Use url for source
- Cleanup spec file with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/294294
OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=48
---
 biosdevname-0.6.1.tar.bz2 |  3 ---
 biosdevname-0.6.1.tar.gz  |  3 +++
 biosdevname.changes       |  6 ++++++
 biosdevname.spec          | 36 +++++++++++++++++++-----------------
 4 files changed, 28 insertions(+), 20 deletions(-)
 delete mode 100644 biosdevname-0.6.1.tar.bz2
 create mode 100644 biosdevname-0.6.1.tar.gz

diff --git a/biosdevname-0.6.1.tar.bz2 b/biosdevname-0.6.1.tar.bz2
deleted file mode 100644
index b762c74..0000000
--- a/biosdevname-0.6.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a295b8d876bb0d75be1b575c414197c629ef132c00b386e2226a7b6324f0bf51
-size 160908
diff --git a/biosdevname-0.6.1.tar.gz b/biosdevname-0.6.1.tar.gz
new file mode 100644
index 0000000..9d99ced
--- /dev/null
+++ b/biosdevname-0.6.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b43580589a3f40afc836afbff9bcd837224c710b75a4d0b576f2e4d44ec158cc
+size 195604
diff --git a/biosdevname.changes b/biosdevname.changes
index a31bb49..a9687cf 100644
--- a/biosdevname.changes
+++ b/biosdevname.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr  3 08:56:16 UTC 2015 - mpluskal@suse.com
+
+- Use url for source
+- Cleanup spec file with spec-cleaner
+
 -------------------------------------------------------------------
 Sat Feb 21 22:49:47 UTC 2015 - meissner@suse.com
 
diff --git a/biosdevname.spec b/biosdevname.spec
index 7041581..a81c6c8 100644
--- a/biosdevname.spec
+++ b/biosdevname.spec
@@ -16,6 +16,7 @@
 #
 
 
+%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
 Name:           biosdevname
 Version:        0.6.1
 Release:        0
@@ -23,30 +24,28 @@ Summary:        Udev helper for naming devices per BIOS names
 License:        GPL-2.0
 Group:          System/Base
 Url:            http://linux.dell.com/files/biosdevname/
-# SMBIOS and PCI IRQ Routing Tables only exist on these arches.  It's
-# also likely that other arches don't expect the PCI bus to be sorted
-# breadth-first, or of so, there haven't been any comments about that
-# on LKML.
-ExclusiveArch:  %{ix86} x86_64
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        http://linux.dell.com/files/biosdevname/biosdevname-%{version}/%{name}-%{version}.tar.gz
 Patch1:         ignore-broken-BIOSes
 Patch2:         whitelist-dell
 Patch3:         udev-rule-path.patch
 Patch4:         biosdevname-pic.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  automake
+# to figure out how to name/location of the rules file
+BuildRequires:  libudev-devel
 BuildRequires:  pciutils-devel
 BuildRequires:  pkgconfig
 BuildRequires:  sed
-BuildRequires:  zlib-devel
-# to figure out how to name/location of the rules file
-BuildRequires:  libudev-devel
 BuildRequires:  suse-module-tools
+BuildRequires:  zlib-devel
 # for ownership of /usr/lib/udev/rules.d
 Requires:       udev
 Supplements:    modalias(dmi:*svnDell*)
-
-%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# SMBIOS and PCI IRQ Routing Tables only exist on these arches.  It's
+# also likely that other arches don't expect the PCI bus to be sorted
+# breadth-first, or of so, there haven't been any comments about that
+# on LKML.
+ExclusiveArch:  %ix86 x86_64
 
 %description
 biosdevname in its simplest form takes an kernel name name as an
@@ -67,12 +66,16 @@ You can enable/disable usage of biosdevname with boot option
 
 %build
 sed -i -e 's#@@BIOSDEVNAME_RULEDEST@@#'%{_udevrulesdir}'/71-biosdevname.rules#' configure.ac
-autoreconf
-%configure --disable-rpath --prefix=/ --bindir=/bin --sbindir=/sbin
+autoreconf -fi
+%configure \
+	--disable-rpath \
+	--prefix=/ \
+	--bindir=/bin \
+	--sbindir=/sbin
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 rm %{buildroot}/sbin/%{name}S || :
 
 %files
@@ -87,8 +90,7 @@ rm %{buildroot}/sbin/%{name}S || :
 /sbin/ldconfig
 %{?regenerate_initrd_post}
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %posttrans
 %{?regenerate_initrd_posttrans}