- updated to 0.10.0

- now virtinst is a part of virt-manager upstream package
- updated dependencies for GTK+ 3 (needs checking, some new may be missing)

diff --git a/virt-manager.spec b/virt-manager.spec
index c47e2fb1ab4ffc9f8e3d29d44d4f8f5ddc833152..e85c8272c365b5e7e6bd87972319571e6d31d15b 100644 (file)
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -1,41 +1,34 @@
 Summary:       Virtual Machine Manager
 Summary(pl.UTF-8):     Zarządca maszyn wirtualnych
 Name:          virt-manager
-Version:       0.9.5
+Version:       0.10.0
 Release:       1
 License:       GPL v2+
 Group:         Applications/Emulators
 Source0:       http://virt-manager.org/download/sources/virt-manager/%{name}-%{version}.tar.gz
-# Source0-md5: 2b622a0f4cd53f83665d9841b5a3cefa
+# Source0-md5: e23b8d2a7623b4e8e256c25735f332c8
 URL:           http://virt-manager.org/
-BuildRequires: autoconf >= 2.50
-BuildRequires: automake
 BuildRequires: gettext-devel >= 0.14.1
 BuildRequires: glib2-devel
 BuildRequires: intltool >= 0.35.0
-BuildRequires: libtool
 BuildRequires: perl-tools-pod
 BuildRequires: python-devel >= 1:2.6
-BuildRequires: sed >= 4.0
-Requires(post,preun):  GConf2
+BuildRequires: rpmbuild(macros) >= 1.592
+Requires(post,postun): glib2
 Requires(post,postun): gtk-update-icon-cache
+Requires:      python-libvirt = %{version}-%{release}
+Requires:      gtk3-vnc >= 0.4.3
+Requires:      gtk+3 >= 3.0
 Requires:      hicolor-icon-theme
 Requires:      python-dbus >= 0.84.0
 Requires:      python-gnome-desktop-librsvg >= 2.32.0
 Requires:      python-gnome-gconf >= 2.28.1
-Requires:      python-gtk-vnc >= 0.4.3
-Requires:      python-libvirt >= 0.9.6
-Requires:      python-libxml2 >= 1:2.7.8
-Requires:      python-pycairo
-Requires:      python-pygobject >= 2.28.6
-Requires:      python-pygtk-gtk >= 2:2.24.0
-Requires:      python-urlgrabber
-Requires:      python-virtinst >= 0.600.3
-Requires:      python-vte0 >= 0.28.2
+Requires:      python-pygobject3
+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:      python-spice-gtk
+Suggests:      spice-gtk
 ExclusiveArch: %{ix86} %{x8664} ia64
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,30 +48,51 @@ statystyki wykorzystania zasobów istniejących maszyn wirtualnych na
 maszynach lokalnych i zdalnych. Wykorzystuje libvirt jako API do
 zarządzania.
 
+%package -n python-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
+Suggests:      virt-viewer >= 0.0.1
+
+%description -n python-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
+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ń
+skryptów, w tym virt-install (tworzący i instalujący nowe VM-y) oraz
+virt-clone (klonujący istniejącą maszynę wirtualną).
+
 %prep
 %setup -q
 
-%{__sed} -i -e 's|PWD|shell pwd|g' icons/hicolor/*/Makefile.am
-
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure \
-       --with-libvirt-package-names=libvirt \
-       --with-kvm-packages=qemu-kvm
-%{__make}
+%{__python} setup.py configure \
+       --libvirt-package-names=libvirt \
+       --kvm-package-names=qemu-lvm
+
+%{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$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
+# requires patching(?)
 #%%py_postclean %{_datadir}/%{name}
 
 %find_lang %{name}
@@ -87,40 +101,51 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install %{name}.schemas
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%preun
-%gconf_schema_uninstall %{name}.schemas
-
 %postun
+if [ "$1" = "0" ]; then
+       %glib_compile_schemas
+fi
 %update_icon_cache hicolor
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
-%{_sysconfdir}/gconf/schemas/%{name}.schemas
-%attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_bindir}/%{name}-tui
-%{_libexecdir}/%{name}-launch
-
-%dir %{_datadir}/%{name}
+%doc NEWS README
+%attr(755,root,root) %{_bindir}/virt-manager
 %{_datadir}/%{name}/icons
-%{_iconsdir}/hicolor/*/apps/virt-manager.png
-
-%{_datadir}/%{name}/*.py
-%{_datadir}/%{name}/*.py[co]
+%{_datadir}/%{name}/ui
 %dir %{_datadir}/%{name}/virtManager
-%{_datadir}/%{name}/virtManager/*.py
-%{_datadir}/%{name}/virtManager/*.py[co]
-%dir %{_datadir}/%{name}/virtManagerTui
-%{_datadir}/%{name}/virtManagerTui/*.py
-%{_datadir}/%{name}/virtManagerTui/*.py[co]
-%dir %{_datadir}/%{name}/virtManagerTui/importblacklist
-%{_datadir}/%{name}/virtManagerTui/importblacklist/*.py
-%{_datadir}/%{name}/virtManagerTui/importblacklist/*.py[co]
-%{_datadir}/%{name}/vmm-*.ui
-
+%{_datadir}/%{name}/virtManager/*.py*
+%attr(755,root,root) %{_datadir}/%{name}/virt-manager
+%{_datadir}/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.xml
 %{_desktopdir}/%{name}.desktop
-%{_datadir}/dbus-1/services/%{name}.service
-%{_mandir}/man1/%{name}.1*
+%{_iconsdir}/hicolor/*/apps/virt-manager.png
+%{_mandir}/man1/virt-manager.1*
+
+%files -n python-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-image
+%attr(755,root,root) %{_bindir}/virt-install
+%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}/virtconv/parsers
+%{_datadir}/%{name}/virtconv/parsers/*.py*
+%dir %{_datadir}/%{name}/virtinst
+%{_datadir}/%{name}/virtinst/*.py*
+%attr(755,root,root) %{_datadir}/%{name}/virt-clone
+%attr(755,root,root) %{_datadir}/%{name}/virt-convert
+%attr(755,root,root) %{_datadir}/%{name}/virt-image
+%attr(755,root,root) %{_datadir}/%{name}/virt-install
+%{_mandir}/man1/virt-clone.1*
+%{_mandir}/man1/virt-convert.1*
+%{_mandir}/man1/virt-image.1*
+%{_mandir}/man1/virt-install.1*
+%{_mandir}/man5/virt-image.5*