From c3aaf1042d62ca0f71c0f1cb4167b126539a2ce5 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 3 Jan 2021 16:14:56 +0100 Subject: [PATCH] - updated to 3.2.0 --- arm-ovmf-path.patch | 13 ------------- virt-manager.spec | 47 ++++++++++++++++++++++++++++++--------------- 2 files changed, 32 insertions(+), 28 deletions(-) delete mode 100644 arm-ovmf-path.patch diff --git a/arm-ovmf-path.patch b/arm-ovmf-path.patch deleted file mode 100644 index 124fe83..0000000 --- a/arm-ovmf-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur virt-manager-2.1.0.orig/virtinst/domcapabilities.py virt-manager-2.1.0/virtinst/domcapabilities.py ---- virt-manager-2.1.0.orig/virtinst/domcapabilities.py 2019-01-11 02:27:09.000000000 +0100 -+++ virt-manager-2.1.0/virtinst/domcapabilities.py 2019-05-09 21:23:21.532000000 +0200 -@@ -175,7 +175,9 @@ - r".*aarch64.*", # generic attempt at a catchall - ], - "armv7l": [ -+ r".*AAVMF32_CODE\.fd", # RHEL - r".*arm/QEMU_EFI.*", # fedora, gerd's firmware repo -+ r".*arm.*", # generic attempt at a catchall - ], - } - diff --git a/virt-manager.spec b/virt-manager.spec index 5816d7d..3407748 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,14 +1,13 @@ Summary: Virtual Machine Manager Summary(pl.UTF-8): Zarządca maszyn wirtualnych Name: virt-manager -Version: 2.2.1 +Version: 3.2.0 Release: 1 Epoch: 1 License: GPL v2+ Group: Applications/Emulators Source0: https://releases.pagure.org/virt-manager/%{name}-%{version}.tar.gz -# Source0-md5: adb4fa436d60b62a8e18a7b3a1667d97 -Patch0: arm-ovmf-path.patch +# Source0-md5: a87507223c32d15eb12e1754404061dc URL: http://virt-manager.org/ BuildRequires: gettext-tools >= 0.14.1 BuildRequires: glib2-devel @@ -58,6 +57,17 @@ statystyki wykorzystania zasobów istniejących maszyn wirtualnych na maszynach lokalnych i zdalnych. Wykorzystuje libvirt jako API do zarządzania. +%package -n bash-completion-%{name} +Summary: bash-completion for libvirt +Group: Applications/Shells +Requires: bash-completion +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif + +%description -n bash-completion-%{name} +This package provides bash-completion for libvirt. + %package -n python3-virtinst Summary: Python modules and utilities for installing virtual machines Summary(pl.UTF-8): Moduły Pythona i narzędzia do instalowania maszyn wirtualnych @@ -86,7 +96,6 @@ virt-clone (klonujący istniejącą maszynę wirtualną). %prep %setup -q -%patch0 -p1 %build %{__python3} setup.py \ @@ -100,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %py3_install +install -d $RPM_BUILD_ROOT/etc/bash_completion.d +%{__mv} $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/* $RPM_BUILD_ROOT/etc/bash_completion.d/ + %find_lang %{name} %clean @@ -123,24 +135,34 @@ fi %{_datadir}/%{name}/ui %dir %{_datadir}/%{name}/virtManager %{_datadir}/%{name}/virtManager/*.py* -%attr(755,root,root) %{_datadir}/%{name}/virt-manager -%attr(755,root,root) %{_datadir}/%{name}/virtManager -%{_datadir}/appdata/virt-manager.appdata.xml +%dir %{_datadir}/%{name}/virtManager/details +%{_datadir}/%{name}/virtManager/details/*.py* +%dir %{_datadir}/%{name}/virtManager/device +%{_datadir}/%{name}/virtManager/device/*.py* +%dir %{_datadir}/%{name}/virtManager/lib +%{_datadir}/%{name}/virtManager/lib/*.py* +%dir %{_datadir}/%{name}/virtManager/object +%{_datadir}/%{name}/virtManager/object/*.py* +%{_datadir}/metainfo/virt-manager.appdata.xml %{_datadir}/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.xml %{_desktopdir}/%{name}.desktop %{_iconsdir}/hicolor/*/apps/virt-manager.png %{_mandir}/man1/virt-manager.1* +%files -n bash-completion-%{name} +%defattr(644,root,root,755) +/etc/bash_completion.d/virt-clone +/etc/bash_completion.d/virt-install +/etc/bash_completion.d/virt-xml + %files -n python3-virtinst -f %{name}.lang %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/virt-clone -%attr(755,root,root) %{_bindir}/virt-convert %attr(755,root,root) %{_bindir}/virt-install %attr(755,root,root) %{_bindir}/virt-xml %dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/virtconv -%{_datadir}/%{name}/virtconv/*.py* %dir %{_datadir}/%{name}/virtinst +%{_datadir}/%{name}/virtinst/build.cfg %{_datadir}/%{name}/virtinst/*.py* %dir %{_datadir}/%{name}/virtinst/devices %{_datadir}/%{name}/virtinst/devices/*.py* @@ -148,11 +170,6 @@ fi %{_datadir}/%{name}/virtinst/domain/*.py* %dir %{_datadir}/%{name}/virtinst/install %{_datadir}/%{name}/virtinst/install/*.py* -%attr(755,root,root) %{_datadir}/%{name}/virt-clone -%attr(755,root,root) %{_datadir}/%{name}/virt-convert -%attr(755,root,root) %{_datadir}/%{name}/virt-install -%attr(755,root,root) %{_datadir}/%{name}/virt-xml %{_mandir}/man1/virt-clone.1* -%{_mandir}/man1/virt-convert.1* %{_mandir}/man1/virt-install.1* %{_mandir}/man1/virt-xml.1* -- 2.44.0