From bf2a4b1c6ddc066859e4ecfce5e97d53515b14fc Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 11 Jan 2025 01:07:06 +0100 Subject: [PATCH] update to 5.0.0 [release 5.0.0-1mamba;Sat Dec 28 2024] --- ...ger-1.0.1-fix-changing-graphics-type.patch | 293 ------------------ virt-manager-1.3.1-disable-packagekit.patch | 37 --- ...anager-1.4.0-fix-italian-translation.patch | 12 - virt-manager.spec | 54 +--- 4 files changed, 11 insertions(+), 385 deletions(-) delete mode 100644 virt-manager-1.0.1-fix-changing-graphics-type.patch delete mode 100644 virt-manager-1.3.1-disable-packagekit.patch delete mode 100644 virt-manager-1.4.0-fix-italian-translation.patch diff --git a/virt-manager-1.0.1-fix-changing-graphics-type.patch b/virt-manager-1.0.1-fix-changing-graphics-type.patch deleted file mode 100644 index 2b57fdb..0000000 --- a/virt-manager-1.0.1-fix-changing-graphics-type.patch +++ /dev/null @@ -1,293 +0,0 @@ -Subject: details: Fix changing graphics type (bz 1083903) -From: Cole Robinson crobinso@redhat.com Thu Apr 3 10:53:54 2014 -0400 -Date: Thu Apr 3 10:53:54 2014 -0400: -Git: 932e6e00bb08647800a62e59f61c8adee9c5de59 - -And clean up the API usage to avoid these types of issues in the future. - -Index: virt-manager-1.0.1/virtManager/addhardware.py -=================================================================== ---- virt-manager-1.0.1.orig/virtManager/addhardware.py -+++ virt-manager-1.0.1/virtManager/addhardware.py -@@ -905,12 +905,12 @@ class vmmAddHardware(vmmGObjectUI): - - # Input getters - def get_config_input(self): -- row = uiutil.get_list_selection(self.widget("input-type")) -+ row = uiutil.get_list_selection(self.widget("input-type"), None) - return row[1], row[2] - - # Network getters - def get_config_net_model(self): -- return uiutil.get_list_selection(self.widget("net-model"))[0] -+ return uiutil.get_list_selection(self.widget("net-model"), 0) - - def get_config_macaddr(self): - macaddr = None -@@ -933,7 +933,7 @@ class vmmAddHardware(vmmGObjectUI): - return usb_info - - def get_config_host_device_info(self): -- return uiutil.get_list_selection(self.widget("host-device")) -+ return uiutil.get_list_selection(self.widget("host-device"), None) - - # Video Getters - def get_config_video_model(self): -@@ -1016,7 +1016,7 @@ class vmmAddHardware(vmmGObjectUI): - uiutil.set_list_selection(self.widget("hw-list"), page) - - def get_hw_selection(self): -- return uiutil.get_list_selection(self.widget("hw-list")) -+ return uiutil.get_list_selection(self.widget("hw-list"), None) - - def update_char_device_type_model(self): - stable_blacklist = ["pipe", "udp"] -Index: virt-manager-1.0.1/virtManager/create.py -=================================================================== ---- virt-manager-1.0.1.orig/virtManager/create.py -+++ virt-manager-1.0.1/virtManager/create.py -@@ -940,8 +940,8 @@ class vmmCreate(vmmGObjectUI): - return self.widget("create-vm-name").get_text() - - def get_config_machine(self): -- return uiutil.get_list_selection(self.widget("config-machine"), -- rowindex=0, check_visible=True) -+ return uiutil.get_list_selection(self.widget("config-machine"), 0, -+ check_visible=True) - - def is_install_page(self): - notebook = self.widget("create-pages") -@@ -965,8 +965,10 @@ class vmmCreate(vmmGObjectUI): - return INSTALL_PAGE_CONTAINER_OS - - def get_config_os_info(self): -- drow = uiutil.get_list_selection(self.widget("install-os-type")) -- vrow = uiutil.get_list_selection(self.widget("install-os-version")) -+ drow = uiutil.get_list_selection( -+ self.widget("install-os-type"), None) -+ vrow = uiutil.get_list_selection( -+ self.widget("install-os-version"), None) - distro = None - dlabel = None - variant = None -@@ -1153,7 +1155,8 @@ class vmmCreate(vmmGObjectUI): - self.detect_media_os() - - def _selected_os_row(self): -- return uiutil.get_list_selection(self.widget("install-os-type")) -+ return uiutil.get_list_selection( -+ self.widget("install-os-type"), None) - - def change_os_type(self, box): - ignore = box -Index: virt-manager-1.0.1/virtManager/createinterface.py -=================================================================== ---- virt-manager-1.0.1.orig/virtManager/createinterface.py -+++ virt-manager-1.0.1/virtManager/createinterface.py -@@ -775,7 +775,7 @@ class vmmCreateInterface(vmmGObjectUI): - is_manual = self.widget("ip-do-manual").get_active() - - copy_row = uiutil.get_list_selection( -- self.widget("ip-copy-interface-combo")) -+ self.widget("ip-copy-interface-combo"), None) - - v4_mode = self.widget("ipv4-mode").get_active() - v4_addr = self.widget("ipv4-address").get_text() -Index: virt-manager-1.0.1/virtManager/details.py -=================================================================== ---- virt-manager-1.0.1.orig/virtManager/details.py -+++ virt-manager-1.0.1/virtManager/details.py -@@ -1109,7 +1109,7 @@ class vmmDetails(vmmGObjectUI): - self.widget("toolbar-box").hide() - - def get_boot_selection(self): -- return uiutil.get_list_selection(self.widget("config-boot-list")) -+ return uiutil.get_list_selection(self.widget("config-boot-list"), None) - - def set_hw_selection(self, page, disable_apply=True): - if disable_apply: -@@ -1117,7 +1117,7 @@ class vmmDetails(vmmGObjectUI): - uiutil.set_list_selection(self.widget("hw-list"), page) - - def get_hw_row(self): -- return uiutil.get_list_selection(self.widget("hw-list")) -+ return uiutil.get_list_selection(self.widget("hw-list"), None) - - def get_hw_selection(self, field): - row = self.get_hw_row() -Index: virt-manager-1.0.1/virtManager/fsdetails.py -=================================================================== ---- virt-manager-1.0.1.orig/virtManager/fsdetails.py -+++ virt-manager-1.0.1/virtManager/fsdetails.py -@@ -155,16 +155,16 @@ class vmmFSDetails(vmmGObjectUI): - return self._dev - - def get_config_fs_mode(self): -- return uiutil.get_list_selection(self.widget("fs-mode-combo"), -- rowindex=0, check_visible=True) -+ return uiutil.get_list_selection(self.widget("fs-mode-combo"), 0, -+ check_visible=True) - - def get_config_fs_wrpolicy(self): -- return uiutil.get_list_selection(self.widget("fs-wrpolicy-combo"), -- rowindex=0, check_visible=True) -+ return uiutil.get_list_selection(self.widget("fs-wrpolicy-combo"), 0, -+ check_visible=True) - - def get_config_fs_type(self): -- return uiutil.get_list_selection(self.widget("fs-type-combo"), -- rowindex=0, check_visible=True) -+ return uiutil.get_list_selection(self.widget("fs-type-combo"), 0, -+ check_visible=True) - - def get_config_fs_readonly(self): - if not self.widget("fs-readonly").is_visible(): -@@ -172,12 +172,12 @@ class vmmFSDetails(vmmGObjectUI): - return self.widget("fs-readonly").get_active() - - def get_config_fs_driver(self): -- return uiutil.get_list_selection(self.widget("fs-driver-combo"), -- rowindex=0, check_visible=True) -+ return uiutil.get_list_selection(self.widget("fs-driver-combo"), 0, -+ check_visible=True) - - def get_config_fs_format(self): -- return uiutil.get_list_selection(self.widget("fs-format-combo"), -- rowindex=0, check_visible=True) -+ return uiutil.get_list_selection(self.widget("fs-format-combo"), 0, -+ check_visible=True) - - # Setters - def set_dev(self, dev): -Index: virt-manager-1.0.1/virtManager/gfxdetails.py -=================================================================== ---- virt-manager-1.0.1.orig/virtManager/gfxdetails.py -+++ virt-manager-1.0.1/virtManager/gfxdetails.py -@@ -134,9 +134,9 @@ class vmmGraphicsDetails(vmmGObjectUI): - self.widget("graphics-password-chk").set_active(False) - - def get_values(self): -- gtype = uiutil.get_list_selection(self.widget("graphics-type")) -+ gtype = uiutil.get_list_selection(self.widget("graphics-type"), 0) - port, tlsport = self._get_config_graphics_ports() -- addr = uiutil.get_list_selection(self.widget("graphics-address")) -+ addr = uiutil.get_list_selection(self.widget("graphics-address"), 0) - keymap = uiutil.get_combo_entry(self.widget("graphics-keymap")) - if keymap == "auto": - keymap = None -Index: virt-manager-1.0.1/virtManager/manager.py -=================================================================== ---- virt-manager-1.0.1.orig/virtManager/manager.py -+++ virt-manager-1.0.1/virtManager/manager.py -@@ -427,7 +427,7 @@ class vmmManager(vmmGObjectUI): - ################## - - def current_row(self): -- return uiutil.get_list_selection(self.widget("vm-list")) -+ return uiutil.get_list_selection(self.widget("vm-list"), None) - - def current_vm(self): - row = self.current_row() -Index: virt-manager-1.0.1/virtManager/migrate.py -=================================================================== ---- virt-manager-1.0.1.orig/virtManager/migrate.py -+++ virt-manager-1.0.1/virtManager/migrate.py -@@ -184,7 +184,7 @@ class vmmMigrateDialog(vmmGObjectUI): - self.reset_state() - - def destconn_changed(self, src): -- row = uiutil.get_list_selection(src) -+ row = uiutil.get_list_selection(src, None) - tooltip = "" - if row: - tooltip = _("A valid destination connection must be selected.") -@@ -212,7 +212,7 @@ class vmmMigrateDialog(vmmGObjectUI): - self.widget("migrate-port").set_sensitive(enable) - - def get_config_destconn(self): -- row = uiutil.get_list_selection(self.widget("migrate-dest")) -+ row = uiutil.get_list_selection(self.widget("migrate-dest"), None) - if not row or not row[2]: - return None - return row[1] -Index: virt-manager-1.0.1/virtManager/netlist.py -=================================================================== ---- virt-manager-1.0.1.orig/virtManager/netlist.py -+++ virt-manager-1.0.1/virtManager/netlist.py -@@ -284,13 +284,11 @@ class vmmNetworkList(vmmGObjectUI): - ############### - - def get_network_row(self): -- return uiutil.get_list_selection(self.widget("net-source")) -+ return uiutil.get_list_selection(self.widget("net-source"), None) - - def get_network_selection(self): -- net_list = self.widget("net-source") - bridge_entry = self.widget("net-bridge-name") -- -- row = uiutil.get_list_selection(net_list) -+ row = self.get_network_row() - if not row: - return None, None, None - -@@ -472,9 +470,9 @@ class vmmNetworkList(vmmGObjectUI): - return - - def _on_net_source_changed(self, src): -+ ignore = src - self._emit_changed() -- -- row = uiutil.get_list_selection(src) -+ row = self.get_network_row() - if not row: - return - -Index: virt-manager-1.0.1/virtManager/storagebrowse.py -=================================================================== ---- virt-manager-1.0.1.orig/virtManager/storagebrowse.py -+++ virt-manager-1.0.1/virtManager/storagebrowse.py -@@ -221,7 +221,7 @@ class vmmStorageBrowser(vmmGObjectUI): - return data["enable_create"] - - def current_pool(self): -- row = uiutil.get_list_selection(self.widget("pool-list")) -+ row = uiutil.get_list_selection(self.widget("pool-list"), None) - if not row: - return - try: -@@ -232,7 +232,7 @@ class vmmStorageBrowser(vmmGObjectUI): - def current_vol_row(self): - if not self.current_pool(): - return -- return uiutil.get_list_selection(self.widget("vol-list")) -+ return uiutil.get_list_selection(self.widget("vol-list"), None) - - def current_vol(self): - pool = self.current_pool() -Index: virt-manager-1.0.1/virtManager/uiutil.py -=================================================================== ---- virt-manager-1.0.1.orig/virtManager/uiutil.py -+++ virt-manager-1.0.1/virtManager/uiutil.py -@@ -58,9 +58,11 @@ def spin_get_helper(widget): - return adj.get_value() - - --def get_list_selection(widget, rowindex=None, check_visible=False): -+def get_list_selection(widget, rowindex, check_visible=False): - """ -- Helper to simplify getting the selected row in a list/tree/combo -+ Helper to simplify getting the selected row and value in a list/tree/combo -+ -+ If rowindex is None, return the whole row. - """ - if check_visible and not widget.get_visible(): - return None -@@ -145,7 +147,7 @@ def get_combo_entry(combo, rowidx=0): - Helper to get the value specified in a combo box, with or - without and entry - """ -- row = get_list_selection(combo) -+ row = get_list_selection(combo, None) - if row: - return row[rowidx] - if not combo.get_has_entry(): \ No newline at end of file diff --git a/virt-manager-1.3.1-disable-packagekit.patch b/virt-manager-1.3.1-disable-packagekit.patch deleted file mode 100644 index 6b2a5f1..0000000 --- a/virt-manager-1.3.1-disable-packagekit.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- virt-manager-1.3.1/virtManager/engine.py.orig 2015-12-26 19:39:11.909828597 +0100 -+++ virt-manager-1.3.1/virtManager/engine.py 2015-12-26 23:15:10.120220049 +0100 -@@ -214,33 +214,7 @@ - def _add_default_conn(self): - manager = self.get_manager() - -- # Manager fail message -- msg = _("Could not detect a default hypervisor. Make\n" -- "sure the appropriate virtualization packages\n" -- "are installed (kvm, qemu, libvirt, etc.), and\n" -- "that libvirtd is running.\n\n" -- "A hypervisor connection can be manually\n" -- "added via File->Add Connection") -- -- logging.debug("Determining default libvirt URI") -- -- ret = None -- try: -- libvirt_packages = self.config.libvirt_packages -- packages = self.config.hv_packages + libvirt_packages -- -- ret = packageutils.check_packagekit(manager, manager.err, packages) -- except: -- logging.exception("Error talking to PackageKit") -- -- if ret: -- tryuri = "qemu:///system" -- else: -- tryuri = vmmConnect.default_uri() -- -- if tryuri is None: -- manager.set_startup_error(msg) -- return -+ tryuri = "qemu:///system" - - warnmsg = _("The 'libvirtd' service will need to be started.\n\n" - "After that, virt-manager will connect to libvirt on\n" diff --git a/virt-manager-1.4.0-fix-italian-translation.patch b/virt-manager-1.4.0-fix-italian-translation.patch deleted file mode 100644 index bef2fdb..0000000 --- a/virt-manager-1.4.0-fix-italian-translation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru virt-manager-1.4.0.orig/po/it.po virt-manager-1.4.0/po/it.po ---- virt-manager-1.4.0.orig/po/it.po 2016-06-18 16:00:11.000000000 +0200 -+++ virt-manager-1.4.0/po/it.po 2016-07-23 16:36:39.364397872 +0200 -@@ -1460,7 +1460,7 @@ - #: ../virtManager/console.py:289 - #, python-format - msgid "%(vm-name)s on %(connection-name)s" --msgstr "%(nome-mv)s su %(nome-connessione)s" -+msgstr "%(vm-name)s su %(connection-name)s" - - #: ../virtManager/console.py:296 - #, python-format diff --git a/virt-manager.spec b/virt-manager.spec index b35ce39..3ea9336 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,17 +1,15 @@ Name: virt-manager -Version: 4.1.0 -Release: 4mamba +Version: 5.0.0 +Release: 1mamba Summary: Virtual Machine Manager Group: Applications/Emulators Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://virt-manager.org/ -Source: http://virt-manager.org/download/sources/virt-manager/virt-manager-%{version}.tar.gz -Patch0: virt-manager-1.0.1-fix-changing-graphics-type.patch -Patch1: virt-manager-1.3.1-disable-packagekit.patch -Patch2: virt-manager-1.4.0-fix-italian-translation.patch +Source: https://releases.pagure.org/virt-manager/virt-manager-%{version}.tar.xz License: GPL +BuildArch: noarch ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END BuildRequires: libvirt-glib-devel >= 1.0.0-1mamba @@ -52,53 +50,24 @@ An embedded VNC client viewer presents a full graphical console to the guest dom %prep %setup -q -#%patch0 -p1 -#%patch1 -p1 -#%patch2 -p1 %build -CFLAGS="%{optflags}" %{__python3} setup.py build +%meson + +%meson_build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%{__python3} setup.py \ - --no-update-icon-cache --no-compile-schemas install \ - --root="%{buildroot}" \ - --install-headers=%{_includedir}/python%{python3_version} \ - --install-lib=%{python3_sitearch} - -# 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|#\!%{__python3}|" $f || : -done +%meson_install %find_lang %{name} -#rm -fr %{buildroot}/var/scrollkeeper - %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%post -if [ $1 -ge 1 ]; then - glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - update-desktop-database -q %{_datadir}/applications -fi -exit 0 - -%postun -if [ $1 -eq 0 ]; then - glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - update-desktop-database -q %{_datadir}/applications -fi -exit 0 - %files -f %{name}.lang %defattr(-,root,root) %{_bindir}/virt-clone -#%{_bindir}/virt-convert %{_bindir}/virt-install %{_bindir}/virt-manager %{_bindir}/virt-xml @@ -111,8 +80,6 @@ exit 0 %{_datadir}/virt-manager/ui/*.ui %dir %{_datadir}/virt-manager/virtManager %{_datadir}/virt-manager/virtManager/* -#%dir %{_datadir}/virt-manager/virtconv -#%{_datadir}/virt-manager/virtconv/*.py %dir %{_datadir}/virt-manager/virtinst %{_datadir}/virt-manager/virtinst/* %{_datadir}/icons/hicolor/*/apps/virt-manager.png @@ -120,14 +87,15 @@ exit 0 %dir %{_datadir}/virt-manager/icons/hicolor %{_datadir}/virt-manager/icons/hicolor/* %{_mandir}/man1/virt-clone.1* -#%{_mandir}/man1/virt-convert.1* %{_mandir}/man1/virt-install.1* %{_mandir}/man1/virt-manager.1* %{_mandir}/man1/virt-xml.1* %doc COPYING -# ChangeLog NEWS README TODO %changelog +* Sat Dec 28 2024 Silvan Calarco 5.0.0-1mamba +- update to 5.0.0 + * Tue Mar 28 2023 Silvan Calarco 4.1.0-4mamba - require osinfo-db