From bc77932fcf95804f4aa3ad84fb3f0846f0c58c510526a5284b24199e15375d6f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 8 Sep 2020 12:29:35 +0000 Subject: [PATCH] - Cure fallout from %_libexecdir change [boo#1174075, boo#1176244] OBS-URL: https://build.opensuse.org/package/show/filesystems/bcache-tools?expand=0&rev=25 --- bcache-tools.changes | 5 +++++ bcache-tools.spec | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bcache-tools.changes b/bcache-tools.changes index c41b144..50e265d 100644 --- a/bcache-tools.changes +++ b/bcache-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 8 11:58:38 UTC 2020 - Jan Engelhardt + +- Cure fallout from %_libexecdir change [boo#1174075, boo#1176244] + ------------------------------------------------------------------- Tue Jan 14 19:27:52 UTC 2020 - Jan Engelhardt diff --git a/bcache-tools.spec b/bcache-tools.spec index 0b724fa..8f77bba 100644 --- a/bcache-tools.spec +++ b/bcache-tools.spec @@ -40,8 +40,9 @@ This package contains utilities for configuring the bcache Module. %build export SUSE_ASNEEDED=0 -make all CFLAGS="%optflags $(pkg-config blkid uuid smartcols --cflags) -std=gnu99" \ - LDFLAGS="$(pkg-config blkid uuid smartcols --libs)" %{?_smp_mflags} +%make_build all \ + CFLAGS="%optflags $(pkg-config blkid uuid smartcols --cflags) -std=gnu99" \ + LDFLAGS="$(pkg-config blkid uuid smartcols --libs)" %install b="%buildroot" @@ -49,7 +50,7 @@ b="%buildroot" mkdir -p "$b"/{sbin,%_sbindir,%_mandir/man8,/lib/udev/rules.d} mkdir -p "$b/%_sysconfdir/initramfs-tools/scripts/init-premount" mkdir -p "$b/%_sysconfdir/initramfs-tools/hooks" -make install DESTDIR="$b" DRACUTLIBDIR="%_libexecdir/dracut" +%make_install DRACUTLIBDIR="%_prefix/lib/dracut" # Not used in openSUSE rm -Rf "$b/%_sysconfdir/initramfs-tools" "$b/%_prefix/lib/initcpio" \ "$b/%_datadir/initramfs-tools" @@ -60,8 +61,8 @@ mv "$b/lib/udev" "$b/%_prefix/lib/" %_sbindir/bcache-super-show %_sbindir/make-bcache %_sbindir/bcache +%_prefix/lib/dracut/ %_prefix/lib/udev -%_libexecdir/dracut/ %_mandir/man8/*.8* %license COPYING