From 01d300e59dd50cae70c5f80ea3e7a9d30f5e5004 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 06:17:53 +0000 Subject: import gnome-boxes-3.28.5-2.el7 --- diff --git a/.gitignore b/.gitignore index 05fdde4..d6c5596 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-boxes-3.22.4.tar.xz +SOURCES/gnome-boxes-3.28.5.tar.xz diff --git a/.gnome-boxes.metadata b/.gnome-boxes.metadata index af28541..184b01a 100644 --- a/.gnome-boxes.metadata +++ b/.gnome-boxes.metadata @@ -1 +1 @@ -cc84566028590d58e19b86c21259eac0a521c128 SOURCES/gnome-boxes-3.22.4.tar.xz +5c29480ed1a8d75ce8fa34418ccbf7b745de793a SOURCES/gnome-boxes-3.28.5.tar.xz diff --git a/SOURCES/gnome-boxes-libgovirt-tracker.patch b/SOURCES/gnome-boxes-libgovirt-tracker.patch new file mode 100644 index 0000000..a1a3d46 --- /dev/null +++ b/SOURCES/gnome-boxes-libgovirt-tracker.patch @@ -0,0 +1,38 @@ +From 92fb1b57abc9fa7b582a82c8e5d58451cdbffad7 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Fri, 8 Jun 2018 13:45:52 +0200 +Subject: [PATCH] build: Revert to using Tracker 1.0.x, and fix the libgovirt + version + +RHEL 7.6 doesn't have Tracker 2.0.x; and libgovirt-0.3.1 is enough. + +https://bugzilla.redhat.com/show_bug.cgi?id=1569793 +--- + src/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index ac79b7fc2677..89727ca44d11 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -129,7 +129,7 @@ dependencies = [ + dependency ('libvirt-gobject-1.0', version: '>= 0.2.0'), + dependency ('libxml-2.0', version: '>= 2.7.8'), + dependency ('spice-client-gtk-3.0', version: '>= 0.32'), +- dependency ('tracker-sparql-2.0'), ++ dependency ('tracker-sparql-1.0'), + dependency ('webkit2gtk-4.0'), + valac.find_library ('gio-2.0-workaround', dirs: vapi_dir), + valac.find_library ('linux'), +@@ -153,7 +153,7 @@ else + vala_args += '--define=HAVE_OVIRT' + + dependencies += [ +- dependency ('govirt-1.0', version: '>= 0.3.4'), ++ dependency ('govirt-1.0', version: '>= 0.3.1'), + valac.find_library ('rest-0.7') + ] + endif +-- +2.14.4 + diff --git a/SOURCES/gnome-boxes-python2.patch b/SOURCES/gnome-boxes-python2.patch new file mode 100644 index 0000000..db65197 --- /dev/null +++ b/SOURCES/gnome-boxes-python2.patch @@ -0,0 +1,8 @@ +--- gnome-boxes-3.28.4/build-aux/post_install.py.python2 2018-05-09 11:48:19.000000000 +0200 ++++ gnome-boxes-3.28.4/build-aux/post_install.py 2018-05-23 22:13:53.921343405 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python3 ++#!/usr/bin/python2 + + import os + import subprocess diff --git a/SOURCES/gnome-boxes-unbreak-the-icon-installation.patch b/SOURCES/gnome-boxes-unbreak-the-icon-installation.patch new file mode 100644 index 0000000..4e24c84 --- /dev/null +++ b/SOURCES/gnome-boxes-unbreak-the-icon-installation.patch @@ -0,0 +1,56 @@ +From e8b9d5ca5ebed5f2e076e6e6c975ec37efc21c5b Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Fri, 8 Jun 2018 12:42:49 +0200 +Subject: [PATCH] build: Unbreak the icon installation in gnome-3-28 + +The icons were getting directly copied to $data_dir/icons without +retaining the directory hierarchy inside. + +Fallout from d2410d0959094dee8cc3e1276b255e8fb991fe31 + +It was also broken in master, but was fixed by +c115f5bfb56aa9fe42356c5f4f9ee87f6c87f454 and +578707e9924c32a808e12c2830f18156ccb109f6 + +https://gitlab.gnome.org/GNOME/gnome-boxes/issues/217 +--- + data/meson.build | 26 +------------------------- + 1 file changed, 1 insertion(+), 25 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 847734e59715..9f1c4b482356 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,28 +1,4 @@ +-icondir = join_paths(data_dir, 'icons') +- +-install_data('icons/hicolor/16x16/apps/org.gnome.Boxes.png', +- install_dir: icondir, +-) +- +-install_data('icons/hicolor/24x24/apps/org.gnome.Boxes.png', +- install_dir: icondir, +-) +- +-install_data('icons/hicolor/symbolic/apps/org.gnome.Boxes-symbolic.svg', +- install_dir: icondir, +-) +-install_data('icons/hicolor/32x32/apps/org.gnome.Boxes.png', +- install_dir: icondir, +-) +- +-install_data('icons/hicolor/48x48/apps/org.gnome.Boxes.png', +- install_dir: icondir, +-) +- +-install_data('icons/hicolor/256x256/apps/org.gnome.Boxes.png', +- install_dir: icondir, +-) +- ++install_subdir('icons/hicolor/', install_dir: join_paths (data_dir, 'icons')) + + resource_files = files ('gnome-boxes.gresource.xml') + resources = gnome.compile_resources ('org.gnome.Boxes', +-- +2.14.4 + diff --git a/SOURCES/revert-use-virtio-video-adapter.patch b/SOURCES/revert-use-virtio-video-adapter.patch new file mode 100644 index 0000000..c492452 --- /dev/null +++ b/SOURCES/revert-use-virtio-video-adapter.patch @@ -0,0 +1,27 @@ +From 9271632f42e0ba4851f47cc0c56584b8c9cdf49b Mon Sep 17 00:00:00 2001 +From: Felipe Borges +Date: Mon, 16 Jul 2018 16:47:23 +0200 +Subject: [PATCH] Revert "vm-configurator: Use VIRTIO video adapter for new + VMs" + +This reverts commit d05c38bb3287b1f8fea75d147f2c982b3de2f9b0. +--- + src/vm-configurator.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala +index 3090e138..3e12cb08 100644 +--- a/src/vm-configurator.vala ++++ b/src/vm-configurator.vala +@@ -355,7 +355,7 @@ private static void set_os_config (Domain domain, InstallerMedia install_media, + + private static void set_video_config (Domain domain, InstallerMedia install_media) { + var video = new DomainVideo (); +- video.set_model (DomainVideoModel.VIRTIO); ++ video.set_model (DomainVideoModel.QXL); + + domain.add_device (video); + } +-- +2.17.1 + diff --git a/SPECS/gnome-boxes.spec b/SPECS/gnome-boxes.spec index 5d149ca..977b7a9 100644 --- a/SPECS/gnome-boxes.spec +++ b/SPECS/gnome-boxes.spec @@ -10,55 +10,73 @@ ExclusiveArch: x86_64 # The following qemu_kvm_arches/with_qemu_kvm defines come from # libvirt.spec %if 0%{?fedora} - %define qemu_kvm_arches %{ix86} x86_64 %{power64} s390x %{arm} aarch64 + %global qemu_kvm_arches %{ix86} x86_64 %{power64} s390x %{arm} aarch64 + %global distributor_name fedora + %global distributor_version %{fedora} %endif %if 0%{?rhel} >= 7 - %define qemu_kvm_arches x86_64 %{power64} + %global qemu_kvm_arches x86_64 %{power64} + %global distributor_name rhel + %global distributor_version %{rhel} %endif %ifarch %{qemu_kvm_arches} - %define with_qemu_kvm 1 + %global with_qemu_kvm 1 %else - %define with_qemu_kvm 0 + %global with_qemu_kvm 0 %endif %global url_ver %%(echo %{version}|cut -d. -f1,2) Name: gnome-boxes -Version: 3.22.4 -Release: 4%{?dist} +Version: 3.28.5 +Release: 2%{?dist} Summary: A simple GNOME 3 application to access remote or virtual systems License: LGPLv2+ URL: https://wiki.gnome.org/Apps/Boxes Source0: http://download.gnome.org/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz -BuildRequires: libgovirt-devel -BuildRequires: intltool -BuildRequires: vala-devel -BuildRequires: vala +# https://gitlab.gnome.org/GNOME/gnome-boxes/issues/217 +Patch0: gnome-boxes-unbreak-the-icon-installation.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1449922 +Patch1: use-ps2-bus-by-default.patch + +Patch2: gnome-boxes-python2.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1569793 +Patch3: gnome-boxes-libgovirt-tracker.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1595754 +Patch4: revert-use-virtio-video-adapter.patch + +BuildRequires: gettext >= 0.19.8 +BuildRequires: meson +BuildRequires: vala >= 0.36.0 BuildRequires: yelp-tools BuildRequires: pkgconfig(clutter-gtk-1.0) -BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.52 BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(govirt-1.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.20 BuildRequires: pkgconfig(gtk-vnc-2.0) BuildRequires: pkgconfig(libarchive) +BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libvirt-gobject-1.0) BuildRequires: pkgconfig(libvirt-gconfig-1.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(gudev-1.0) -BuildRequires: pkgconfig(libosinfo-1.0) -BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(libosinfo-1.0) >= 1.1.0 +BuildRequires: pkgconfig(libsoup-2.4) >= 2.44 BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(tracker-sparql-1.0) +BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: spice-gtk3-vala BuildRequires: libosinfo-vala BuildRequires: desktop-file-utils -BuildRequires: tracker-devel -BuildRequires: libuuid-devel -#BuildRequires: autoconf automake libtool # Pulls in libvirtd + KVM, but no NAT / firewall configs %if %{with_qemu_kvm} @@ -67,20 +85,29 @@ Requires: libvirt-daemon-kvm Requires: libvirt-daemon-qemu %endif -Patch0: use-ps2-bus-by-default.patch - -# Pulls in libvirtd NAT based networking -# https://bugzilla.redhat.com/show_bug.cgi?id=1081762 +# Pulls in the libvirtd NAT 'default' network +# Original request: https://bugzilla.redhat.com/show_bug.cgi?id=1081762 +# +# However, the 'default' network does not mix well with the Fedora livecd +# when it is run inside a VM. The whole saga is documented here: +# +# boxes: https://bugzilla.redhat.com/show_bug.cgi?id=1164492 +# libvirt: https://bugzilla.redhat.com/show_bug.cgi?id=1146232 +# +# Until a workable solution has been determined and implemented, this +# dependency should stay disabled in rawhide and fedora development +# branches so it does not end up on the livecd. Once a Fedora GA is +# released, a gnome-boxes update can be pushed with this dependency +# re-enabled. crobinso will handle this process, see: +# +# https://bugzilla.redhat.com/show_bug.cgi?id=1164492#c71 Requires: libvirt-daemon-config-network # Needed for unattended installations Requires: mtools Requires: genisoimage -# gnome-boxes uses a dark theme Requires: adwaita-icon-theme -Requires: gnome-themes-standard -Requires: dconf %description gnome-boxes lets you easily create, setup, access, and use: @@ -90,28 +117,32 @@ gnome-boxes lets you easily create, setup, access, and use: * When technology permits, set up access for applications on local virtual machines - %prep %setup -q - -# https://bugzilla.redhat.com/show_bug.cgi?id=1449922 -%patch0 -p1 -b .use-ps2-bus-by-default +%patch0 -p1 +%patch1 -p1 -b .use-ps2-bus-by-default +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build -%configure --enable-vala -make %{?_smp_mflags} V=1 +%meson \ +%if %{?distributor_name:1}%{!?distributor_name:0} + -D distributor_name=%{distributor_name} \ +%endif +%if 0%{?distributor_version} + -D distributor_version=%{distributor_version} \ +%endif +%meson_build %install -make vala-clean -%make_install +%meson_install %find_lang %{name} --with-gnome - %check desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Boxes.desktop - %post update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -128,25 +159,34 @@ fi gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : - %files -f %{name}.lang %license COPYING %doc AUTHORS README NEWS TODO %{_bindir}/%{name} %{_datadir}/%{name}/ -%{_datadir}/appdata/org.gnome.Boxes.appdata.xml %{_datadir}/applications/org.gnome.Boxes.desktop %{_datadir}/glib-2.0/schemas/org.gnome.boxes.gschema.xml -%{_datadir}/icons/hicolor/*/apps/gnome-boxes.* -%{_datadir}/icons/hicolor/symbolic/apps/gnome-boxes-symbolic.svg +%{_datadir}/icons/hicolor/*/apps/org.gnome.Boxes.png +%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Boxes-symbolic.svg %{_libexecdir}/gnome-boxes-search-provider %{_datadir}/dbus-1/services/org.gnome.Boxes.SearchProvider.service %{_datadir}/dbus-1/services/org.gnome.Boxes.service %dir %{_datadir}/gnome-shell %dir %{_datadir}/gnome-shell/search-providers %{_datadir}/gnome-shell/search-providers/gnome-boxes-search-provider.ini +%{_datadir}/metainfo/org.gnome.Boxes.appdata.xml %changelog +* Mon Jul 16 2018 Felipe Borges - 3.28.5-2 +- Revert using VIRTIO video adapter by default for new VMs +- Resolves: #1595754 + +* Fri Jun 08 2018 Debarshi Ray - 3.28.5-1 +- Update to 3.28.5 +- Fix the libgovirt requirement +- Revert to using Python 2 and Tracker 1.0 +- Resolves: #1567399 + * Thu Jun 08 2017 Felipe Borges - 3.22.4-4 - Use PS2 bus by default - Related: #1449922