- merged 5.0.0 from PLD

diff --git a/virt-manager.spec b/virt-manager.spec
index 53ce5c0592d6cdfd7ce7b5a1f56a956a72e978df..63b251b0776b07fe25940fbc6d174745ed11ea81 100644 (file)
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -1,47 +1,42 @@
-

 Summary:       Virtual Machine Manager
 Summary(pl.UTF-8):     Zarządca maszyn wirtualnych
 Name:          virt-manager
 Summary:       Virtual Machine Manager
 Summary(pl.UTF-8):     Zarządca maszyn wirtualnych
 Name:          virt-manager

-Version:       4.1.0
-Release:       2
+Version:       5.0.0
+Release:       1

 Epoch:         1
 License:       GPL v2+
 Group:         Applications/Emulators
 Epoch:         1
 License:       GPL v2+
 Group:         Applications/Emulators

-Source0:       https://releases.pagure.org/virt-manager/%{name}-%{version}.tar.gz
-# Source0-md5: 8bf86bcc7e43a956ff94ebdaf4d7d399
-URL:           http://virt-manager.org/
+Source0:       https://releases.pagure.org/virt-manager/%{name}-%{version}.tar.xz
+# Source0-md5: 83b4c8dec30d445fc7117f6dc7418315
+URL:           https://virt-manager.org/
+BuildRequires: docutils

 BuildRequires: gettext-tools >= 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: python3-devel
-BuildRequires: python3-libvirt >= 0.9.6
-BuildRequires: python3-libxml2 >= 1:2.7.8
-BuildRequires: rpmbuild(macros) >= 1.592
-Requires(post,postun): glib2
+BuildRequires: meson >= 0.63.0
+BuildRequires: ninja >= 1.5
+BuildRequires: python3-devel >= 1:3.4
+BuildRequires: rpmbuild(macros) >= 1.736
+BuildRequires: sed >= 4.0
+Requires(post,postun): glib2 >= 1:1.26

 Requires(post,postun): gtk-update-icon-cache
 Requires:      dconf
 Requires:      adwaita-icon-theme
 Requires:      gnome-icon-theme
 Requires(post,postun): gtk-update-icon-cache
 Requires:      dconf
 Requires:      adwaita-icon-theme
 Requires:      gnome-icon-theme

-Requires:      gtk+3 >= 3.14
+Requires:      gtk+3 >= 3.22.0

 Requires:      gtk3-vnc >= 0.4.3
 Requires:      gtksourceview4
 Requires:      hicolor-icon-theme
 Requires:      gtk3-vnc >= 0.4.3
 Requires:      gtksourceview4
 Requires:      hicolor-icon-theme

-Requires:      libosinfo >= 1.0.0
+Requires:      libosinfo >= 0.2.10

 Requires:      libvirt-glib >= 0.0.9
 Requires:      libvirt-glib >= 0.0.9

-Requires:      python3-chardet
-Requires:      python3-idna

 Requires:      python3-libvirt >= 0.9.6
 Requires:      python3-libvirt >= 0.9.6

-Requires:      python3-pycairo
-Requires:      python3-pygobject3 >= 3.14
+Requires:      python3-pygobject3 >= 3.32
+Requires:      python3-requests

 Requires:      python3-virtinst = %{epoch}:%{version}-%{release}
 Requires:      spice-gtk
 Requires:      vte >= 0.34
 Requires:      xorriso
 Suggests:      gnome-keyring >= 0.4.9
 Suggests:      python3-libguestfs >= 1.12.0
 Requires:      python3-virtinst = %{epoch}:%{version}-%{release}
 Requires:      spice-gtk
 Requires:      vte >= 0.34
 Requires:      xorriso
 Suggests:      gnome-keyring >= 0.4.9
 Suggests:      python3-libguestfs >= 1.12.0

-ExclusiveArch: %{ix86} %{x8664} ia64
+BuildArch:     noarch

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _debugsource_packages   0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _debugsource_packages   0


@@ -62,16 +57,20 @@ statystyki wykorzystania zasobów istniejących maszyn wirtualnych na
 maszynach lokalnych i zdalnych. Wykorzystuje libvirt jako API do
 zarządzania.
 
 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
+%package -n bash-completion-virt-manager
+Summary:       bash-completion for virt-clone, virt-install and virt-xml commands
+Summary(pl.UTF-8):     bashowe uzupełnianie parametrów poleceń virt-clone, virt-install i virt-xml
+Group:         Applications/Shells
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      bash-completion >= 2.0
+BuildArch:     noarch
+
+%description -n bash-completion-virt-manager
+Bash-completion for virt-clone, virt-install and virt-xml commands.

 
 

-%description -n bash-completion-%{name}
-This package provides bash-completion for libvirt.
+%description -n bash-completion-virt-manager -l pl.UTF-8
+Bashowe uzupełnianie parametrów polecenń virt-clone, virt-install i
+virt-xml.

 
 %package -n python3-virtinst
 Summary:       Python modules and utilities for installing virtual machines
 
 %package -n python3-virtinst
 Summary:       Python modules and utilities for installing virtual machines


@@ -79,11 +78,11 @@ Summary(pl.UTF-8):  Moduły Pythona i narzędzia do instalowania maszyn wirtualny
 Group:         Libraries/Python
 Requires:      python3-libvirt >= 0.9.6
 Requires:      python3-libxml2 >= 1:2.7.8
 Group:         Libraries/Python
 Requires:      python3-libvirt >= 0.9.6
 Requires:      python3-libxml2 >= 1:2.7.8

-Requires:      python3-modules
+Requires:      python3-modules >= 1:3.4

 Requires:      python3-requests
 Suggests:      python3-selinux
 Suggests:      virt-viewer >= 0.0.1
 Requires:      python3-requests
 Suggests:      python3-selinux
 Suggests:      virt-viewer >= 0.0.1

-Obsoletes:     python-virtinst
+Obsoletes:     python-virtinst < 2.0.0

 
 %description -n python3-virtinst
 virtinst is a module that helps build and install libvirt based
 
 %description -n python3-virtinst
 virtinst is a module that helps build and install libvirt based


@@ -102,24 +101,23 @@ virt-clone (klonujący istniejącą maszynę wirtualną).
 %prep
 %setup -q
 
 %prep
 %setup -q
 

+%{__sed} -i -e 's,/usr/bin/env python3,%{__python3},' scripts/make_bin_wrapper.py
+

 %build
 %build

-%{__python3} setup.py \
-        configure \
-       --prefix=%{_prefix} \
+%meson build \
+       -Ddefault-hvs="qemu,xen,lxc" \
+       -Dupdate-icon-cache=false \
+       -Dcompile-schemas=false \
+       -Dtests=disabled
+
+%ninja_build -C build

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 

-%{__python3} setup.py \
-       --no-update-icon-cache \
-       --no-compile-schemas install \
-       --prefix=%{_prefix} \
-       --root=$RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT/etc/bash_completion.d
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/* $RPM_BUILD_ROOT/etc/bash_completion.d/
+%ninja_install -C build

 
 

-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/kab
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie

 
 %find_lang %{name}
 
 
 %find_lang %{name}
 


@@ -158,11 +156,11 @@ fi
 %{_iconsdir}/hicolor/*/apps/virt-manager.png
 %{_mandir}/man1/virt-manager.1*
 
 %{_iconsdir}/hicolor/*/apps/virt-manager.png
 %{_mandir}/man1/virt-manager.1*
 

-%files -n bash-completion-%{name}
+%files -n bash-completion-virt-manager

 %defattr(644,root,root,755)
 %defattr(644,root,root,755)

-/etc/bash_completion.d/virt-clone
-/etc/bash_completion.d/virt-install
-/etc/bash_completion.d/virt-xml
+%{bash_compdir}/virt-clone
+%{bash_compdir}/virt-install
+%{bash_compdir}/virt-xml

 
 %files -n python3-virtinst -f %{name}.lang
 %defattr(644,root,root,755)
 
 %files -n python3-virtinst -f %{name}.lang
 %defattr(644,root,root,755)