Rebase to 0.6.2

Resolves: #1090868

0001-Place-udev-rules-to-usr-lib.patch

@@ -0,0 +1,26 @@
+From 14a0cef248d2996cde90e64ae56d7bdb569b3995 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= <vpavlin@redhat.com>
+Date: Mon, 23 Sep 2013 14:05:59 +0200
+Subject: [PATCH] Place udev rules to /usr/lib
+
+---
+ biosdevname.rules.in | 2 +-
+ configure.ac         | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/biosdevname.rules.in b/biosdevname.rules.in
+index e26ba98..8c12cb8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -68,7 +68,7 @@ AC_CHECK_FUNCS([dup2 gettimeofday memset munmap select socket strcasecmp strchr
+ 
+ # this is ugly, but accounts for SLES 10, Red Hat/Fedora, and Ubuntu
+ # handles default udev rules as of udev 114 or thereabouts
+-RULEDEST=/lib/udev/rules.d/71-biosdevname.rules
++RULEDEST=${prefix}/lib/udev/rules.d/71-biosdevname.rules
+ 
+ if [[ -e /etc/udev/rules.d/60-net.rules ]]; then
+      # RHEL 5 / Fedora
+-- 
+1.8.3.1
+

biosdevname-0.6.1-rules.patch

@@ -0,0 +1,21 @@
+diff --git a/biosdevname.rules.in b/biosdevname.rules.in
+index 0a32aa5..52aaea5 100644
+--- a/biosdevname.rules.in
++++ b/biosdevname.rules.in
+@@ -12,13 +15,13 @@ ENV{biosdevname}=="?*", ENV{UDEV_BIOSDEVNAME}="$env{biosdevname}"
+ ENV{UDEV_BIOSDEVNAME}=="0", GOTO="netdevicename_end"
+ ENV{UDEV_BIOSDEVNAME}=="1", GOTO="netdevicename_start"
+ 
+-# uncomment the next line for biosdevname to be off by default
+-# GOTO="netdevicename_end"
++# off by default
++GOTO="netdevicename_end"
+ 
+ LABEL="netdevicename_start"
+ 
+ # using NAME= instead of setting INTERFACE_NAME, so that persistent
+ # names aren't generated for these devices, they are "named" on each boot.
+-SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --policy physical -i %k", NAME="%c",  OPTIONS+="string_escape=replace"
++SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --smbios 2.6 --nopirq --policy physical -i %k", NAME="%c"  OPTIONS+="string_escape=replace"
+ 
+ LABEL="netdevicename_end"

biosdevname.spec

@@ -1,6 +1,6 @@
 Name:		biosdevname
-Version:	0.5.0
+Version:	0.6.2
-Release:	5%{?dist}
+Release:	1%{?dist}
 Summary:	Udev helper for naming devices per BIOS names
 
 Group:		System Environment/Base
@@ -14,14 +14,15 @@ Source0:	http://linux.dell.com/files/%{name}/%{name}-%{version}/%{name}-%{versio
 
 BuildRequires:	pciutils-devel, zlib-devel
 # to figure out how to name the rules file
-BuildRequires:	udev
+BuildRequires:	systemd
 #To generate the configure script
 BuildRequires:	autoconf
 BuildRequires:	automake
 # for ownership of /etc/udev/rules.d
-Requires: udev
+Requires: systemd
 
-Patch1: biosdevname-0.5.0-rules.patch
+Patch0: 0001-Place-udev-rules-to-usr-lib.patch
+Patch1: biosdevname-0.6.1-rules.patch
 
 %description
 biosdevname in its simplest form takes a kernel device name as an
@@ -32,14 +33,16 @@ name (e.g. eth0).
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 
 %build
+autoreconf -iv
 #If configure script doesn't exist generate it with autogen script
 [ -e ./configure ] || ./autogen.sh --no-configure
 
 # this is a udev rule, so it needs to live in / rather than /usr
-%configure --disable-rpath --prefix=/ --sbindir=/sbin
+%configure --disable-rpath --prefix=%{_prefix} --sbindir=%{_prefix}/sbin
 make %{?_smp_mflags}
 
 
@@ -49,13 +52,15 @@ make install install-data DESTDIR=%{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-/sbin/%{name}
+%{_sbindir}/%{name}
-# hack for either /etc or /lib rules location
+%{_prefix}/lib/udev/rules.d/*.rules
-/*/udev/rules.d/*.rules
 %{_mandir}/man1/%{name}.1*
 
 
 %changelog
+* Fri Jun 26 2015 Michal Sekletar <msekleta@redhat.com> - 0.6.2-1
+- Rebase to 0.6.2
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

sources

@@ -1 +1 @@
-a82d9abf81140513dd4a58144c701a3c  biosdevname-0.5.0.tar.gz
+2a5f8f64dc19eef6cdcfb05a9cee4442  biosdevname-0.6.2.tar.gz