[v1] spec: Install egg-info with rpm package

[libvirt] [libvirt-python PATCH] spec: Install egg-info with rpm package

Posted by Martin Kletzander 6 years, 11 months ago

This was being done due to now deprecated policy and that file should
be installed so that pip can recognize that the packages is already
installed in the system.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---
 libvirt-python.spec.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in
index 5ad029281c52..132183c93c02 100644
--- a/libvirt-python.spec.in
+++ b/libvirt-python.spec.in
@@ -65,7 +65,6 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
 %if %{with_python3}
 %{__python3} setup.py install --skip-build --root=%{buildroot}
 %endif
-rm -f %{buildroot}%{_libdir}/python*/site-packages/*egg-info

 %check
 %{__python} setup.py test
@@ -81,6 +80,8 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*egg-info
 %{_libdir}/python2*/site-packages/libvirt_lxc.py*
 %{_libdir}/python2*/site-packages/libvirtmod*

+%{_libdir}/python*/site-packages/*egg-info
+
 %if %{with_python3}
 %files -n libvirt-python3
 %defattr(-,root,root)
-- 
2.13.0

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

Re: [libvirt] [libvirt-python PATCH] spec: Install egg-info with rpm package

Posted by Daniel P. Berrange 6 years, 11 months ago

On Mon, May 15, 2017 at 05:26:39PM +0200, Martin Kletzander wrote:
> This was being done due to now deprecated policy and that file should
> be installed so that pip can recognize that the packages is already
> installed in the system.
> 
> Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
> ---
>  libvirt-python.spec.in | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in
> index 5ad029281c52..132183c93c02 100644
> --- a/libvirt-python.spec.in
> +++ b/libvirt-python.spec.in
> @@ -65,7 +65,6 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
>  %if %{with_python3}
>  %{__python3} setup.py install --skip-build --root=%{buildroot}
>  %endif
> -rm -f %{buildroot}%{_libdir}/python*/site-packages/*egg-info
> 
>  %check
>  %{__python} setup.py test
> @@ -81,6 +80,8 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*egg-info
>  %{_libdir}/python2*/site-packages/libvirt_lxc.py*
>  %{_libdir}/python2*/site-packages/libvirtmod*
> 
> +%{_libdir}/python*/site-packages/*egg-info

That wildcard looks like it'll put the python3 egg info in the python2 RPM

> +
>  %if %{with_python3}
>  %files -n libvirt-python3
>  %defattr(-,root,root)

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] [libvirt-python PATCH] spec: Install egg-info with rpm package

Posted by Martin Kletzander 6 years, 11 months ago

On Mon, May 15, 2017 at 04:30:17PM +0100, Daniel P. Berrange wrote:
>On Mon, May 15, 2017 at 05:26:39PM +0200, Martin Kletzander wrote:
>> This was being done due to now deprecated policy and that file should
>> be installed so that pip can recognize that the packages is already
>> installed in the system.
>>
>> Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
>> ---
>>  libvirt-python.spec.in | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in
>> index 5ad029281c52..132183c93c02 100644
>> --- a/libvirt-python.spec.in
>> +++ b/libvirt-python.spec.in
>> @@ -65,7 +65,6 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
>>  %if %{with_python3}
>>  %{__python3} setup.py install --skip-build --root=%{buildroot}
>>  %endif
>> -rm -f %{buildroot}%{_libdir}/python*/site-packages/*egg-info
>>
>>  %check
>>  %{__python} setup.py test
>> @@ -81,6 +80,8 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*egg-info
>>  %{_libdir}/python2*/site-packages/libvirt_lxc.py*
>>  %{_libdir}/python2*/site-packages/libvirtmod*
>>
>> +%{_libdir}/python*/site-packages/*egg-info
>
>That wildcard looks like it'll put the python3 egg info in the python2 RPM
>

You are absolutely right.  I didn't realize it's two different rpm
packages.  Fix is on the way.

>> +
>>  %if %{with_python3}
>>  %files -n libvirt-python3
>>  %defattr(-,root,root)
>
>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