X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=virt-manager.spec;h=4b8b859f394cd4a110484e76b4bad2d2afa9d030;hb=b6abe11f02a4e320dd4295248a901902bb72664e;hp=3434c6d37ec1011969ccced7016ce5484d308e1d;hpb=e92093444c869d3d2e4230818f8fa051539ac1d6;p=packages%2Fvirt-manager.git

diff --git a/virt-manager.spec b/virt-manager.spec
index 3434c6d..4b8b859 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -1,39 +1,43 @@
 Summary:	Virtual Machine Manager
 Summary(pl.UTF-8):	Zarządca maszyn wirtualnych
 Name:		virt-manager
-Version:	1.3.2
-Release:	2
+Version:	2.2.0
+Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		Applications/Emulators
-Source0:	https://fedorahosted.org/released/virt-manager/%{name}-%{version}.tar.gz
-# Source0-md5:	6d0436939769b66457034b1ae7040b85
+Source0:	https://releases.pagure.org/virt-manager/%{name}-%{version}.tar.gz
+# Source0-md5:	e2cc07609e11915496e9480232c29869
+Patch0:		arm-ovmf-path.patch
 URL:		http://virt-manager.org/
-BuildRequires:	gettext-devel >= 0.14.1
+BuildRequires:	gettext-tools >= 0.14.1
 BuildRequires:	glib2-devel
 BuildRequires:	intltool >= 0.35.0
+BuildRequires:	libosinfo >= 1.0.0
 BuildRequires:	perl-tools-pod
-BuildRequires:	python-devel >= 1:2.6
+BuildRequires:	python3-devel
+BuildRequires:	python3-libvirt >= 0.9.6
 BuildRequires:	rpmbuild(macros) >= 1.592
 Requires(post,postun):	glib2
 Requires(post,postun):	gtk-update-icon-cache
-Requires:	gtk+3 >= 3.0
+Requires:	dconf
+Requires:	adwaita-icon-theme
+Requires:	gnome-icon-theme
+Requires:	gtk+3 >= 3.14
 Requires:	gtk3-vnc >= 0.4.3
 Requires:	hicolor-icon-theme
-Requires:	libosinfo
-Requires:	libvirt-glib
-Requires:	python-dbus >= 0.84.0
-Requires:	python-ipaddr
-Requires:	python-libvirt >= 0.9.6
-Requires:	python-libvirt-glib
-Requires:	python-pygobject3
-Requires:	python-requests
-Requires:	python-virtinst = %{epoch}:%{version}-%{release}
+Requires:	libosinfo >= 1.0.0
+Requires:	libvirt-glib >= 0.0.9
+Requires:	python3-chardet
+Requires:	python3-idna
+Requires:	python3-libvirt >= 0.9.6
+Requires:	python3-pycairo
+Requires:	python3-pygobject3 >= 3.14
+Requires:	python3-virtinst = %{epoch}:%{version}-%{release}
 Requires:	spice-gtk
 Requires:	vte >= 0.34
 Suggests:	gnome-keyring >= 0.4.9
-Suggests:	python-gnome-desktop-keyring >= 2.15.4
-Suggests:	python-libguestfs >= 1.12.0
+Suggests:	python3-libguestfs >= 1.12.0
 ExclusiveArch:	%{ix86} %{x8664} ia64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -53,25 +57,26 @@ statystyki wykorzystania zasobów istniejących maszyn wirtualnych na
 maszynach lokalnych i zdalnych. Wykorzystuje libvirt jako API do
 zarządzania.
 
-%package -n python-virtinst
+%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
 Group:		Libraries/Python
-Requires:	python-libvirt >= 0.9.6
-Requires:	python-libxml2 >= 1:2.7.8
-Requires:	python-modules
-Requires:	python-urlgrabber
-Suggests:	python-selinux
+Requires:	python3-libvirt >= 0.9.6
+Requires:	python3-libxml2 >= 1:2.7.8
+Requires:	python3-modules
+Requires:	python3-requests
+Suggests:	python3-selinux
 Suggests:	virt-viewer >= 0.0.1
+Obsoletes:	python-virtinst
 
-%description -n python-virtinst
+%description -n python3-virtinst
 virtinst is a module that helps build and install libvirt based
 virtual machines. Currently supports KVM, QEmu and Xen virtual
 machines. Package includes several command line utilities, including
 virt-install (build and install new VMs) and virt-clone (clone an
 existing virtual machine).
 
-%description -n python-virtinst -l pl.UTF-8
+%description -n python3-virtinst -l pl.UTF-8
 virtinst to moduł pomagający przy tworzeniu i instalowaniu maszyn
 wirtualnych opartych na libvirt. Obecnie obsługiwane są maszyny KVM,
 QEmu i Xen. Pakiet zawiera kilka działających z linii poleceń
@@ -80,25 +85,19 @@ virt-clone (klonujący istniejącą maszynę wirtualną).
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__python} setup.py configure \
-	--libvirt-package-names=libvirt \
-	--kvm-package-names=qemu-lvm
+%{__python3} setup.py \
+        configure \
+	--prefix=%{_prefix}
 
-%{__python} setup.py build
+%py3_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__python} setup.py install \
-	--optimize=2 \
-	--root=$RPM_BUILD_ROOT
-
-%py_comp $RPM_BUILD_ROOT%{_datadir}/%{name}
-%py_ocomp $RPM_BUILD_ROOT%{_datadir}/%{name}
-# requires patching(?)
-#%%py_postclean %{_datadir}/%{name}
+%py3_install
 
 %find_lang %{name}
 
@@ -117,33 +116,37 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README
+%doc NEWS.md README.md
 %attr(755,root,root) %{_bindir}/virt-manager
 %{_datadir}/%{name}/icons
 %{_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
 %{_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 python-virtinst -f %{name}.lang
+%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}/virtcli
-%{_datadir}/%{name}/virtcli/*.py*
-%{_datadir}/%{name}/virtcli/cli.cfg
 %dir %{_datadir}/%{name}/virtconv
 %{_datadir}/%{name}/virtconv/*.py*
 %dir %{_datadir}/%{name}/virtinst
 %{_datadir}/%{name}/virtinst/*.py*
+%dir %{_datadir}/%{name}/virtinst/devices
+%{_datadir}/%{name}/virtinst/devices/*.py*
+%dir %{_datadir}/%{name}/virtinst/domain
+%{_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