diff --git a/virt-manager.changes b/virt-manager.changes index a49fedc3..035cad81 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue May 11 09:26:27 UTC 2010 - seife@opensuse.org - -- fix virt-{clone,convert,image,install} by installing the python - libs into the proper directories - ------------------------------------------------------------------- Mon Apr 26 10:58:32 MDT 2010 - carnold@novell.com diff --git a/virt-manager.spec b/virt-manager.spec index f31ae3e2..e7914494 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -25,8 +25,6 @@ %define virtinst_rel 3 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} -%define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") - Name: virt-manager Summary: Virtual Machine Manager Version: 0.8.4 @@ -158,7 +156,7 @@ popd %install make install DESTDIR=$RPM_BUILD_ROOT pushd $RPM_BUILD_DIR/%{virtinst_name} -python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --install-lib=%{pysite}/ +python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --install-lib=%{_datadir}/virt-manager rm -rf $RPM_BUILD_ROOT/var/scrollkeeper popd #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a @@ -223,9 +221,9 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization; %{_datadir}/%{name}/*.py %dir %{_datadir}/%{name}/virtManager %{_datadir}/%{name}/virtManager/*.py -%dir %{pysite}/virtinst -%{pysite}/virtinst/*.py -%{pysite}/virtinst/*.pyc +%dir %{_datadir}/%{name}/virtinst +%{_datadir}/%{name}/virtinst/*.py +%{_datadir}/%{name}/virtinst/*.pyc # %dir %attr(775,root,root) %{_datadir}/locale/or # %dir %attr(775,root,root) %{_datadir}/locale/or/LC_MESSAGES # %{_datadir}/locale/or/LC_MESSAGES/* @@ -241,13 +239,13 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization; %{_mandir}/man1/virt-install.1* %{_mandir}/man5/virt-image.5* # new files for virt-manager-0.8.1 -%dir %{pysite}/virtconv -%{pysite}/virtconv/*.py -%{pysite}/virtconv/*.pyc -%dir %{pysite}/virtconv/parsers -%{pysite}/virtconv/parsers/*.py -%{pysite}/virtconv/parsers/*.pyc -%{pysite}/%{virtinst_name}-py2.6.egg-info +%dir %{_datadir}/%{name}/virtconv +%{_datadir}/%{name}/virtconv/*.py +%{_datadir}/%{name}/virtconv/*.pyc +%dir %{_datadir}/%{name}/virtconv/parsers +%{_datadir}/%{name}/virtconv/parsers/*.py +%{_datadir}/%{name}/virtconv/parsers/*.pyc +%{_datadir}/%{name}/%{virtinst_name}-py2.6.egg-info %doc %{_datadir}/gnome/help/%{name}/C/figures/*.png %doc %{_datadir}/gnome/help/%{name}/C/*.xml # FIXME: autobuild complains that these are unowned (not true...)