spec: Own %{_libdir}/libvirt{, /connection-driver} dirs, mark licenses as %license

Message ID b3571062ff439e4853f1a95208ff2951ded06dba.1503851707.git.crobinso@redhat.com
State New
Headers show
Series
  • spec: Own %{_libdir}/libvirt{, /connection-driver} dirs, mark licenses as %license
Related show

Commit Message

Cole Robinson Aug. 27, 2017, 4:35 p.m.
From: Ville Skyttä <ville.skytta@iki.fi>

https://bugzilla.redhat.com/show_bug.cgi?id=1483293
Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 libvirt.spec.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Peter Krempa Aug. 28, 2017, 7:15 a.m. | #1
On Sun, Aug 27, 2017 at 12:35:07 -0400, Cole Robinson wrote:
> From: Ville Skyttä <ville.skytta@iki.fi>

> 

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

> Signed-off-by: Cole Robinson <crobinso@redhat.com>

> ---


Looks like two separate problems. Also the commit message is rather
sparse.

>  libvirt.spec.in | 4 +++-

>  1 file changed, 3 insertions(+), 1 deletion(-)

> 

> diff --git a/libvirt.spec.in b/libvirt.spec.in

> index 2b58bf3a9..2d21e60bc 100644

> --- a/libvirt.spec.in

> +++ b/libvirt.spec.in

> @@ -1794,6 +1794,8 @@ exit 0

>  %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/

>  

>  

> +%dir %attr(0755, root, root) %{_libdir}/libvirt/

> +%dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/

>  %dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver

>  %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so

>  

> @@ -2028,7 +2030,7 @@ exit 0

>  %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh

>  

>  %files libs -f %{name}.lang

> -%doc COPYING COPYING.LESSER

> +%license COPYING COPYING.LESSERa


According to https://bugzilla.redhat.com/show_bug.cgi?id=1396828 ,
%license will not work on rhel/centos 6.

You should add the hack described in the BZ. Or not change it at all,
since it's not clear from this commit or the bugzilla why it's needed.

Or we can finally drop rhel6 support :P
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Cole Robinson Sept. 14, 2017, 9:44 p.m. | #2
On 08/28/2017 03:15 AM, Peter Krempa wrote:
> On Sun, Aug 27, 2017 at 12:35:07 -0400, Cole Robinson wrote:

>> From: Ville Skyttä <ville.skytta@iki.fi>

>>

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

>> Signed-off-by: Cole Robinson <crobinso@redhat.com>

>> ---

> 

> Looks like two separate problems. Also the commit message is rather

> sparse.

> 

>>  libvirt.spec.in | 4 +++-

>>  1 file changed, 3 insertions(+), 1 deletion(-)

>>

>> diff --git a/libvirt.spec.in b/libvirt.spec.in

>> index 2b58bf3a9..2d21e60bc 100644

>> --- a/libvirt.spec.in

>> +++ b/libvirt.spec.in

>> @@ -1794,6 +1794,8 @@ exit 0

>>  %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/

>>  

>>  

>> +%dir %attr(0755, root, root) %{_libdir}/libvirt/

>> +%dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/

>>  %dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver

>>  %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so

>>  

>> @@ -2028,7 +2030,7 @@ exit 0

>>  %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh

>>  

>>  %files libs -f %{name}.lang

>> -%doc COPYING COPYING.LESSER

>> +%license COPYING COPYING.LESSERa

> 

> According to https://bugzilla.redhat.com/show_bug.cgi?id=1396828 ,

> %license will not work on rhel/centos 6.

> 

> You should add the hack described in the BZ. Or not change it at all,

> since it's not clear from this commit or the bugzilla why it's needed.

> 


Thanks for the review and sorry for not checking %license closely. I've sent
split apart patches with some more info, and %license back compat

Thanks,
Cole

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

Patch

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 2b58bf3a9..2d21e60bc 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1794,6 +1794,8 @@  exit 0
 %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/
 
 
+%dir %attr(0755, root, root) %{_libdir}/libvirt/
+%dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/
 %dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver
 %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so
 
@@ -2028,7 +2030,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.*