From da4aaf15e612620766a561f3647b8fe8323694a1 Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Thu, 22 Mar 2018 10:17:20 +0100 Subject: [PATCH] Rebase to biosdevname-0.7.3 I forgot that biosdevname upstream no longer puts releases to FTP and moved to Github based release process. This makes things a bit more complicated for downstreams, since tarball no longer contains generated configure script so we need to pull-in autotools during the build. Second issue is that release tarball also contains .gitignore file which excludes biosdevname.rules.in and hence this file can't be patches auto-magically with %autosetup so I had to downgrade to %autopatch. Reported-by: Xose Vazquez Perez --- ...es-file-in-usr-lib-udev-rules.d-71-b.patch | 26 ------------------- ... => 0002-Place-udev-rules-to-usr-lib.patch | 0 biosdevname.spec | 17 ++++++++---- sources | 2 +- 4 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 0002-Install-udev-rules-file-in-usr-lib-udev-rules.d-71-b.patch rename 0001-Place-udev-rules-to-usr-lib.patch => 0002-Place-udev-rules-to-usr-lib.patch (100%) diff --git a/0002-Install-udev-rules-file-in-usr-lib-udev-rules.d-71-b.patch b/0002-Install-udev-rules-file-in-usr-lib-udev-rules.d-71-b.patch deleted file mode 100644 index 97ea583..0000000 --- a/0002-Install-udev-rules-file-in-usr-lib-udev-rules.d-71-b.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0b23cc14838c3385fa84a1b07ea6d476954c09ac Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Wed, 21 Mar 2018 18:40:10 +0100 -Subject: [PATCH 2/2] Install udev rules file in - /usr/lib/udev/rules.d/71-biosdevname.rules - ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index bd8e5a3..161f732 100755 ---- a/configure -+++ b/configure -@@ -10560,7 +10560,7 @@ done - - # 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=/usr/lib/udev/rules.d/71-biosdevname.rules - - if [ -e /etc/udev/rules.d/60-net.rules ]; then - # RHEL 5 / Fedora --- -2.14.3 - diff --git a/0001-Place-udev-rules-to-usr-lib.patch b/0002-Place-udev-rules-to-usr-lib.patch similarity index 100% rename from 0001-Place-udev-rules-to-usr-lib.patch rename to 0002-Place-udev-rules-to-usr-lib.patch diff --git a/biosdevname.spec b/biosdevname.spec index 5a9837d..07a20dd 100644 --- a/biosdevname.spec +++ b/biosdevname.spec @@ -1,5 +1,5 @@ Name: biosdevname -Version: 0.7.2 +Version: 0.7.3 Release: 1%{?dist} Summary: Udev helper for naming devices per BIOS names Group: System Environment/Base @@ -11,12 +11,14 @@ URL: http://linux.dell.com/files/%{name} ExclusiveArch: %{ix86} x86_64 Source0: http://linux.dell.com/files/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz -BuildRequires: pciutils-devel, zlib-devel +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc -BuildRequires: git +BuildRequires: pciutils-devel +BuildRequires: zlib-devel Patch1: 0001-Disable-biosdevname-by-default.patch -Patch2: 0002-Install-udev-rules-file-in-usr-lib-udev-rules.d-71-b.patch +Patch2: 0002-Place-udev-rules-to-usr-lib.patch %description biosdevname in its simplest form takes a kernel device name as an @@ -26,9 +28,11 @@ the chassis is "Gb1") doesn't map directly and obviously to the kernel name (e.g. eth0). %prep -%autosetup -S git_am +%setup -q +%autopatch %build +autoreconf -fvi %configure --prefix=%{_prefix} make %{?_smp_mflags} @@ -43,6 +47,9 @@ make install install-data DESTDIR=%{buildroot} %{_mandir}/man1/%{name}.1* %changelog +* Thu Mar 22 2018 Michal Sekletar - 0.7.3-1 +- rebase to biosdevname-0.7.3 + * Wed Mar 21 2018 Michal Sekletar - 0.7.2-1 - rebase to biosdevname-0.7.2 diff --git a/sources b/sources index f825e2c..b4d1943 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (biosdevname-0.7.2.tar.gz) = 2b71d33b3c7ab6c19f6129763a4c044f9cb4cbc43aec0e0d2a83177d8edb1440c17ffc4ab2eae448ae997dcb4b52315f8266c2e4010367f9690e4552cba89502 +SHA512 (biosdevname-0.7.3.tar.gz) = 9cd2b7d115d6ee487f4aafa21b00025a3917d3c89489fe70ab3de8aa979158477a1d0b5287101b7cec7200fef0d2f6894a0e6389a174d6f8670dcd7530dc445d