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

Cole Robinson posted 1 patch 6 years, 6 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/4c0a8c08516049a44f2664150925a7bb9d98b62d.1505424661.git.crobinso@redhat.com
libvirt.spec.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
[libvirt] [PATCH] spec: Use %license when available
Posted by Cole Robinson 6 years, 6 months ago
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ä <ville.skytta@iki.fi>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 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
Re: [libvirt] [PATCH] spec: Use %license when available
Posted by Daniel P. Berrange 6 years, 6 months ago
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ä <ville.skytta@iki.fi>
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---
>  libvirt.spec.in | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>


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
Posted by Daniel P. Berrange 6 years, 6 months ago
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
Posted by Cole Robinson 6 years, 6 months ago
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

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