From 3092b795a4b4b30d154658823359019cefa4a272 Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Feb 02 2017 11:35:12 +0000 Subject: Avoid spurious dependencies on kernel-debug etc. This fix was originally made by Pino Toscano in RHEL 7.3 (commit af91f62b9d). I have ported it to Fedora. (cherry picked from commit bc8658477cd00c6ad8554bd71ae52ee27a082cb7) --- diff --git a/libguestfs.spec b/libguestfs.spec index 4a2d74a..fc2ce4b 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -20,7 +20,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.34.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ # Source and patches. @@ -1044,6 +1044,17 @@ move_to xfsprogs zz-packages-xfs move_to zfs-fuse zz-packages-zfs popd +# If there is a bogus dependency on kernel-*, rename it to 'kernel' +# instead. This can happen for various reasons: +# - DNF picks kernel-debug instead of kernel. +# - Version of kernel-rt in brew > version of kernel. +# On all known architectures, depending on 'kernel' should +# mean "we need a kernel". +pushd $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d +sed 's/^kernel-.*/kernel/' < packages > packages-t +mv packages-t packages +popd + # For the libguestfs-live-service subpackage install the systemd # service and udev rules. mkdir -p $RPM_BUILD_ROOT%{_unitdir} @@ -1421,6 +1432,9 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/ %changelog +* Thu Feb 02 2017 Pino Toscano - 1:1.34.4-2 +- Avoid spurious dependencies on kernel-debug etc. + * Tue Jan 31 2017 Richard W.M. Jones - 1:1.34.4-1 - New upstream version 1.34.4.