diff --git a/virt-manager.spec b/virt-manager.spec index f319b09..49ccc04 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,6 +1,6 @@ Name: virt-manager -Version: 1.5.1 -Release: 2mamba +Version: 2.1.0 +Release: 3mamba Summary: Virtual Machine Manager Group: Applications/Emulators Vendor: openmamba @@ -15,27 +15,29 @@ License: GPL ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END BuildRequires: libvirt-glib-devel >= 1.0.0-1mamba -Requires: libvirt -Requires: python-libvirt Conflicts: python-virtinst -Requires: python-urlgrabber +Requires: libvirt +Requires: python-libvirt-py36 +Requires: python-libxml2-py36 +Requires: python-urllib3-py36 +Requires: python-chardet-py36 +Requires: python-certifi-py36 +Requires: python-idna-py36 +Requires: python-requests-py36 +Requires: pygobject-py36 +#Requires: python-urlgrabber Requires: bridge-utils Requires: python-gnome #Requires: python-libvirt-glib -Requires: python-libxml2 -Requires: python-ipaddr +#Requires: python-ipaddr Requires: adwaita-icon-theme Requires: libspice-gtk Requires: spice-gtk Requires: libvte Requires: gtk-vnc -Requires: pygobject Requires: qemu Requires: libosinfo Requires: openssh-askpass -Requires: python-requests -Requires: python-chardet -Requires: python-idna BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -51,16 +53,23 @@ An embedded VNC client viewer presents a full graphical console to the guest dom #%patch1 -p1 #%patch2 -p1 +# Replace '#!/usr/bin/env python3' with '#!/usr/bin/python3' +# The format is ideal for upstream, but not a distro. See: +# https://fedoraproject.org/wiki/Features/SystemPythonExecutablesUseSystemPython +for f in $(find %{buildroot} -type f -executable -print); do + sed -i "1 s|^#!/usr/bin/env python3|#!%{__python36}|" $f || : +done + %build -CFLAGS="%{optflags}" %{__python} setup.py build +CFLAGS="%{optflags}" %{__python36} setup.py build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%{__python} setup.py \ +%{__python36} setup.py \ --no-update-icon-cache --no-compile-schemas install \ --root="%{buildroot}" \ - --install-headers=%{_includedir}/python%{python_version} \ - --install-lib=%{python_sitearch} + --install-headers=%{_includedir}/python%{python36_version} \ + --install-lib=%{python36_sitearch} %find_lang %{name} @@ -91,6 +100,7 @@ exit 0 %{_bindir}/virt-install %{_bindir}/virt-manager %{_bindir}/virt-xml +%{_datadir}/bash-completion/completions/virt-* %{_datadir}/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.xml %dir %{_datadir}/virt-manager %dir %{_datadir}/virt-manager/ui @@ -98,6 +108,7 @@ exit 0 %{_datadir}/virt-manager/virt-clone %{_datadir}/virt-manager/virt-convert #%{_datadir}/virt-manager/virt-image +%{_datadir}/virt-manager/virtinst %{_datadir}/virt-manager/virt-install %{_datadir}/virt-manager/virt-manager %{_datadir}/virt-manager/virt-xml @@ -113,7 +124,7 @@ exit 0 %{_datadir}/%{name}/virtManager/*.py %{_datadir}/appdata/virt-manager.appdata.xml %{_datadir}/applications/virt-manager.desktop -%{_datadir}/GConf/gsettings/org.virt-manager.virt-manager.convert +#%{_datadir}/GConf/gsettings/org.virt-manager.virt-manager.convert %{_datadir}/icons/hicolor/*/apps/virt-manager.png %dir %{_datadir}/virt-manager/icons %dir %{_datadir}/virt-manager/icons/hicolor @@ -129,6 +140,15 @@ exit 0 # ChangeLog NEWS README TODO %changelog +* Sat Mar 16 2019 Silvan Calarco 2.1.0-3mamba +- fixed requirement typo + +* Fri Mar 15 2019 Silvan Calarco 2.1.0-2mamba +- fix requirements and shebang for python 3.6 + +* Fri Mar 08 2019 Automatic Build System 2.1.0-1mamba +- automatic version update by autodist + * Mon Jul 30 2018 Silvan Calarco 1.5.1-2mamba - rebuilt by autoport with build requirements: python-libvirt-glib-devel>=1.0.0-1mamba