[libvirt] [PATCH] spec: prefer canonical name of util-linux

I noticed that in two places, we require util-linux, and in a third, we require util-linux-ng. On Fedora (I tested F15 through rawhide), util-linux-ng is obsoleted by util-linux; on RHEL 6, util-linux is obsoleted by util-linux-ng. That is, on either platform, either name will get you the correct package installed (where the preferred name on fedora is util-linux, and on RHEL 6 is util-linux-ng). But on RHEL 5, there is no util-linux-ng * libvirt.spec.in (Requires): Use util-linux, not util-linux-ng. --- I debated about pushing this under the trivial rule, but decided not to. Also, if you look at Fedora's git repository for libvirt, you'll notice that Peter Robinson attempted this same patch for F17 in commit f9de2f6, but with no explanation why. libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 11e3199..e3d0a2d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -614,7 +614,7 @@ Requires: PolicyKit >= 0.6 %if %{with_storage_fs} Requires: nfs-utils # For mkfs -Requires: util-linux-ng +Requires: util-linux # For pool-build probing for existing pools BuildRequires: libblkid-devel >= 2.17 # For glusterfs -- 1.7.11.4

On 04.10.2012 18:09, Eric Blake wrote:
I noticed that in two places, we require util-linux, and in a third, we require util-linux-ng. On Fedora (I tested F15 through rawhide), util-linux-ng is obsoleted by util-linux; on RHEL 6, util-linux is obsoleted by util-linux-ng. That is, on either platform, either name will get you the correct package installed (where the preferred name on fedora is util-linux, and on RHEL 6 is util-linux-ng). But on RHEL 5, there is no util-linux-ng
* libvirt.spec.in (Requires): Use util-linux, not util-linux-ng. ---
I debated about pushing this under the trivial rule, but decided not to. Also, if you look at Fedora's git repository for libvirt, you'll notice that Peter Robinson attempted this same patch for F17 in commit f9de2f6, but with no explanation why.
libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in index 11e3199..e3d0a2d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -614,7 +614,7 @@ Requires: PolicyKit >= 0.6 %if %{with_storage_fs} Requires: nfs-utils # For mkfs -Requires: util-linux-ng +Requires: util-linux # For pool-build probing for existing pools BuildRequires: libblkid-devel >= 2.17 # For glusterfs
ACK Michal

On 10/05/2012 06:26 AM, Michal Privoznik wrote:
On 04.10.2012 18:09, Eric Blake wrote:
I noticed that in two places, we require util-linux, and in a third, we require util-linux-ng. On Fedora (I tested F15 through rawhide), util-linux-ng is obsoleted by util-linux; on RHEL 6, util-linux is obsoleted by util-linux-ng. That is, on either platform, either name will get you the correct package installed (where the preferred name on fedora is util-linux, and on RHEL 6 is util-linux-ng). But on RHEL 5, there is no util-linux-ng
* libvirt.spec.in (Requires): Use util-linux, not util-linux-ng. ---
ACK
Thanks; pushed. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake
-
Michal Privoznik