On 09/15/2017 12:09 PM, Daniel P. Berrange wrote:
> On Fri, Sep 15, 2017 at 09:09:05AM +0100, Daniel P. Berrange wrote:
>> On Thu, Sep 14, 2017 at 05:43:37PM -0400, Cole Robinson wrote:
>>> This is required by the fedora packaging guidelines:
>>>
>>> https://fedoraproject.org/wiki/Packaging:LicensingGuidelines
>>>
>>> This macro isn't available on stock RHEL6 so provide a backcompat
>>> definition
>
> This doesn't seem to have worked
>
> https://ci.centos.org/view/libvirt/job/libvirt-master-rpm/systems=libvirt-centos-6/585/console
>
Thanks for the pointer, I pushed the attach fix that made things work
for me on RHEL6
- Cole
>From 11b0e889b530c5e0b31b3953c45ab0e4a47ad116 Mon Sep 17 00:00:00 2001
Message-Id: <11b0e889b530c5e0b31b3953c45ab0e4a47ad116.1505495724.git.crobinso@xxxxxxxxxx>
From: Cole Robinson <crobinso@xxxxxxxxxx>
Date: Fri, 15 Sep 2017 13:04:18 -0400
Subject: [PATCH] spec: Fix %license compat on RHEL6
The macro needs to be defined closer to its usage
Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx>
---
libvirt.spec.in | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 5f232b1ba..a3bd77f8a 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -15,9 +15,6 @@
# touch configure.ac or Makefile.am.
%{!?enable_autotools:%global enable_autotools 0}
-# RHEL6 doesn't have 'license' macro
-%{!?_licensedir:%global license %%doc}
-
# The hypervisor drivers that run in libvirtd
%define with_xen 0%{!?_without_xen:1}
%define with_qemu 0%{!?_without_qemu:1}
@@ -2032,6 +2029,8 @@ exit 0
%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
%files libs -f %{name}.lang
+# RHEL6 doesn't have 'license' macro
+%{!?_licensedir:%global license %%doc}
%license COPYING COPYING.LESSER
%config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf
%config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf
--
2.13.5
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
