Re: [libvirt] [PATCH] spec: Use %license when available

2017-09-15 Thread Cole Robinson 
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.crobi...@redhat.com>
From: Cole Robinson 
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 
---
 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@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] spec: Use %license when available

2017-09-15 Thread Daniel P. Berrange 
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


Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] spec: Use %license when available

2017-09-15 Thread Daniel P. Berrange 
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
> 
> https://bugzilla.redhat.com/show_bug.cgi?id=1483293
> 
> Reported-by: Ville Skyttä 
> Signed-off-by: Cole Robinson 
> ---
>  libvirt.spec.in | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrange 


Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH] spec: Use %license when available

2017-09-14 Thread Cole Robinson 
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

https://bugzilla.redhat.com/show_bug.cgi?id=1483293

Reported-by: Ville Skyttä 
Signed-off-by: Cole Robinson 
---
 libvirt.spec.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 583fb0583..5f232b1ba 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -15,6 +15,8 @@
 # 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}
@@ -2030,7 +2032,7 @@ exit 0
 %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
 
 %files libs -f %{name}.lang
-%doc COPYING COPYING.LESSER
+%license COPYING COPYING.LESSER
 %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf
 %config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf
 %{_libdir}/libvirt.so.*
-- 
2.13.5

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list