From 20ff34c444c16b51e1a604bf95041b80361b27cb Mon Sep 17 00:00:00 2001 From: F1ash Date: Oct 26 2016 09:26:34 +0000 Subject: Version 0.37.57/fixed --- diff --git a/.gitignore b/.gitignore index b70fa94..b021579 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /0.27.50.tar.gz /0.34.50.tar.gz +/0.37.57.tar.gz diff --git a/qt-virt-manager.spec b/qt-virt-manager.spec index 7356354..9511102 100644 --- a/qt-virt-manager.spec +++ b/qt-virt-manager.spec @@ -1,25 +1,29 @@ -%global binname qt5-virt-manager +%global cmake_build_dir build-cmake +%global debug_package %{nil} +%bcond_without qt4 +%bcond_without qt5 Name: qt-virt-manager Version: 0.37.57 Release: 1%{?dist} Summary: Qt Virtual Machine Manager - +Group: Applications/System License: GPLv2+ -URL: http://f1ash.github.io/%{name} Source0: https://github.com/F1ash/%{name}/archive/%{version}.tar.gz - -# be compatible with prior subpackages -Provides: virt-manager-qt4 = %{version}-%{release} -Obsoletes: virt-manager-qt4 <= 0.25.47 -Obsoletes: virt-manager-qt5 <= 0.25.47 - -Requires: hicolor-icon-theme +URL: http://f1ash.github.io/%{name} Requires: libvirt +Requires: hicolor-icon-theme +%if %with qt4 +Requires: qtermwidget >= 0.6.0-2 +Requires: qt4-remote-viewer +%endif +%if %with qt5 Requires: qtermwidget-qt5 >= 0.6.0-2 -Requires: qt-remote-viewer - +Requires: qt5-remote-viewer +# for SPICE audio channels +Requires: qt5-qtmultimedia +%endif # for use qemu-kvm (more useful) Requires: qemu-kvm Requires: libvirt-daemon-driver-qemu @@ -29,21 +33,26 @@ Requires: libvirt-daemon-driver-qemu #Requires: spice-server Requires: spice-vdagent -# optional runtime extensions -%if 0%{?fedora} -# for scrubbing +# for use VNC viewer +Requires: libvncserver + +# for scrubbing (optional) Suggests: scrub -# netcat for ssh-transported remote connections +# netcat for ssh-transported remote connections (optional) Suggests: nc -# for use VNC client with tls +# for use VNC client with tls (optional) Suggests: gnutls -%endif +%if %with qt4 +BuildRequires: qt4-devel +BuildRequires: qtermwidget-devel >= 0.6.0-2 +%endif +%if %with qt5 BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtmultimedia-devel BuildRequires: qt5-qtsvg-devel BuildRequires: qtermwidget-qt5-devel >= 0.6.0-2 - +BuildRequires: qt5-qtmultimedia-devel +%endif BuildRequires: libvirt-devel BuildRequires: glibc-headers BuildRequires: desktop-file-utils @@ -57,44 +66,92 @@ BuildRequires: libcacard-devel %endif %description -Qt Virtual Machine Manager provides a graphical tool for -administering virtual machines for QEMU/KVM, Xen, and LXC -and other Virtual Entities. -Start, stop, add or remove virtual devices, connect to a -graphical or serial console, and see resource usage -statistics for existing VMs on local or remote machines. -Uses libvirt as the backend management API. - -%package -n qt-remote-viewer -Summary: Qt Remote Viewer -# for use VNC viewer -Requires: libvncserver +Qt Virtual Machine Manager provides a graphical tool for administering virtual +machines for QEMU/KVM, Xen, OpenVZ, VBox, VMWare and LXC and other Virtual Entities. +Start, stop, add or remove virtual devices, connect to a graphical or serial console, +and see resource usage statistics for existing VMs on local or remote machines. +Uses libvirt as the back-end management API. Uses Spice/VNC viewers for control. + +%package -n qt4-virt-manager +Summary: Qt4 Virtual Machine Manager + +%description -n qt4-virt-manager +Qt4 Virtual Machine Manager provides a graphical tool for administering virtual +machines for QEMU/KVM, Xen, OpenVZ, VBox, VMWare and LXC and other Virtual Entities. +Start, stop, add or remove virtual devices, connect to a graphical or serial console, +and see resource usage statistics for existing VMs on local or remote machines. +Uses libvirt as the back-end management API. Uses Spice/VNC viewers for control. -%description -n qt-remote-viewer -Qt viewer for remote access to Spice/VNC desktops. +%package -n qt5-virt-manager +Summary: Qt5 Virtual Machine Manager +%description -n qt5-virt-manager +Qt5 Virtual Machine Manager provides a graphical tool for administering virtual +machines for QEMU/KVM, Xen, OpenVZ, VBox, VMWare and LXC and other Virtual Entities. +Start, stop, add or remove virtual devices, connect to a graphical or serial console, +and see resource usage statistics for existing VMs on local or remote machines. +Uses libvirt as the back-end management API. Uses Spice/VNC viewers for control. + +%package -n qt4-remote-viewer +Summary: Qt4 Remote Viewer + +%description -n qt4-remote-viewer +Qt4 viewer for remote access to Spice/VNC desktops. + +%package -n qt5-remote-viewer +Summary: Qt5 Remote Viewer + +%description -n qt5-remote-viewer +Qt5 viewer for remote access to Spice/VNC desktops. %prep %setup -q %build -mkdir -p %{_target_platform} -pushd %{_target_platform} -%cmake -DBUILD_QT_VERSION=5 \ +%if %with qt4 +mkdir %{cmake_build_dir}-qt4 +pushd %{cmake_build_dir}-qt4 +%if %{?fedora}>=24 + %cmake -DWITH_LIBCACARD=1 .. +%else + %cmake .. +%endif + %{make_build} +popd +%endif +%if %with qt5 +mkdir %{cmake_build_dir}-qt5 +pushd %{cmake_build_dir}-qt5 %if %{?fedora}>=24 - -DWITH_LIBCACARD=1 \ + %cmake -DBUILD_QT_VERSION=5 -DWITH_LIBCACARD=1 .. +%else + %cmake -DBUILD_QT_VERSION=5 .. %endif - .. + %{make_build} popd -%make_build -C %{_target_platform} +%endif %install -%make_install -C %{_target_platform} +%if %with qt4 +pushd %{cmake_build_dir}-qt4 + %{make_install} +popd +%endif +%if %with qt5 +pushd %{cmake_build_dir}-qt5 + %{make_install} +popd +%endif %check -desktop-file-validate %{buildroot}/%{_datadir}/applications/%{binname}.desktop +%if %with qt4 +desktop-file-validate %{buildroot}/%{_datadir}/applications/qt4-virt-manager.desktop +desktop-file-validate %{buildroot}/%{_datadir}/applications/qt4-remote-viewer.desktop +%endif +%if %with qt5 +desktop-file-validate %{buildroot}/%{_datadir}/applications/qt5-virt-manager.desktop desktop-file-validate %{buildroot}/%{_datadir}/applications/qt5-remote-viewer.desktop - +%endif %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -108,80 +165,53 @@ fi %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +%if %with qt4 +%files -n qt4-virt-manager +%license LICENSE +%doc README.md Licenses Changelog +%{_bindir}/qt4-virt-manager +%{_datadir}/applications/qt4-virt-manager.desktop +%{_datadir}/qt4-virt-manager +%{_datadir}/icons/hicolor/256x256/apps/virtual-engineering.png + +%files -n qt4-remote-viewer +%license LICENSE +%{_bindir}/qt4-remote-viewer +%{_datadir}/applications/qt4-remote-viewer.desktop +%{_datadir}/icons/hicolor/256x256/apps/remote-desktop-viewer.png +%endif -%files -%license LICENSE Licenses -%doc README.md Changelog -%{_bindir}/%{binname} -%{_datadir}/applications/%{binname}.desktop -%{_datadir}/%{binname}/ +%if %with qt5 +%files -n qt5-virt-manager +%license LICENSE +%doc README.md Licenses Changelog +%{_bindir}/qt5-virt-manager +%{_datadir}/applications/qt5-virt-manager.desktop +%{_datadir}/qt5-virt-manager %{_datadir}/icons/hicolor/256x256/apps/virtual-engineering.png -%files -n qt-remote-viewer +%files -n qt5-remote-viewer %license LICENSE %{_bindir}/qt5-remote-viewer %{_datadir}/applications/qt5-remote-viewer.desktop %{_datadir}/icons/hicolor/256x256/apps/remote-desktop-viewer.png - +%endif %changelog -* Wed Oct 26 2016 Fl@sh - 0.37.57-1 -- new version -- add qt-remote-viewer subpackage - -* Fri Jul 29 2016 Raphael Groner - 0.34.50-1 -- new version -- add support for VNC - -* Wed Jun 01 2016 Raphael Groner - 0.27.50-4 -- remove broken dependency to nc6 -- add options as Suggests -- remove useless R: xorg-x11-drv-qxl - -* Fri May 13 2016 Raphael Groner - 0.27.50-3 -- rebuilt - -* Wed May 11 2016 Raphael Groner - 0.27.50-2 -- add R: xorg-x11-drv-qxl - -* Wed May 11 2016 Raphael Groner - 0.27.50-1 -- new version, qt5 only - -* Sun Mar 20 2016 Fl@sh - 0.25.47-1 -- fixed RHBZ #1319386; -- version updated; - -* Thu Mar 10 2016 Fl@sh - 0.22.45-1 -- changed URL, BR and %%build for libcacard using after F23 release; +* Tue Oct 18 2016 Fl@sh - 0.37.57-1 - version updated; +- added changes for qt-remote-viewer subpackages; -* Thu Feb 04 2016 Fedora Release Engineering - 0.22.42-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Dec 17 2015 Rex Dieter 0.22.42-2 -- BR: qt5-qtmultimedia-devel (#1292612) - -* Thu Dec 17 2015 Raphael Groner - 0.22.42-1 -- new version - -* Mon Oct 12 2015 Raphael Groner - 0.16.38-3 -- rename sub packages - -* Mon Oct 12 2015 Raphael Groner - 0.16.38-2 -- adjust for review, based on upstream's proposal -- use suffixed binaries - -* Sun Sep 20 2015 Fl@sh - 0.16.38-1 -- improved spec for using SPICE, Qemu/KVM, ssh connections; +* Wed Oct 5 2016 Fl@sh - 0.37.56-1 - version updated; -* Tue Jun 23 2015 Fl@sh - 0.12.28-1 +* Wed Sep 21 2016 Fl@sh - 0.36.55-1 - version updated; +- added remote-desktop-viwer into %%check and %%files; -* Wed May 13 2015 Fl@sh - 0.10.25-1 -- changed %%files for desktop icon; +* Sat Jul 16 2016 Fl@sh - 0.34.50-1 - version updated; -* Thu Apr 23 2015 Fl@sh - 0.10.21-1 +* Wed May 11 2016 Fl@sh - 0.27.50-1 - version updated; - clear %%changelog; diff --git a/sources b/sources index 2fc1eb5..b912481 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -167a0eebcd1a01f5647d4f885eaf6f87 0.37.57.tar.gz +52a3c41dd562c8e70ab39b90074d2624 0.37.57.tar.gz