Compare commits

..

No commits in common. 'i9-spice' and 'c9' have entirely different histories.
i9-spice ... c9

@ -1,50 +0,0 @@
From 98d9f202ef768f22ae21b5c43a080a1aa64a7107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Tue, 26 Apr 2022 17:36:54 +0100
Subject: [PATCH] data: remove bogus param for meson i18n.merge_file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The positional parameter used to be treated as 'input', but since we
already set 'input' explicitly it is redundant. With latest meson
versions it now generates an error
data/meson.build:4:7: ERROR: Function does not take positional arguments.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
data/meson.build | 3 ---
1 file changed, 3 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index d718491..4325108 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,7 +2,6 @@ if host_machine.system() != 'windows'
desktop = 'remote-viewer.desktop'
i18n.merge_file (
- desktop,
type: 'desktop',
input: desktop + '.in',
output: desktop,
@@ -14,7 +13,6 @@ if host_machine.system() != 'windows'
mimetypes = 'virt-viewer-mime.xml'
i18n.merge_file (
- mimetypes,
type: 'xml',
input: mimetypes + '.in',
output: mimetypes,
@@ -27,7 +25,6 @@ if host_machine.system() != 'windows'
metainfo = 'remote-viewer.appdata.xml'
i18n.merge_file (
- metainfo,
type: 'xml',
input: metainfo + '.in',
output: metainfo,
--
2.37.1

@ -2,21 +2,19 @@
%if 0%{?rhel} >= 9 %if 0%{?rhel} >= 9
%global with_govirt 0 %global with_govirt 0
%global with_spice 1 %global with_spice 0
%else %else
# Disabled since it is still stuck on soup2 %global with_govirt 1
%global with_govirt 0
%global with_spice 1 %global with_spice 1
%endif %endif
Name: virt-viewer Name: virt-viewer
Version: 11.0 Version: 11.0
Release: 1%{?dist}.inferit Release: 1%{?dist}
Summary: Virtual Machine Viewer Summary: Virtual Machine Viewer
License: GPL-2.0-or-later License: GPLv2+
URL: https://gitlab.com/virt-viewer/virt-viewer URL: https://gitlab.com/virt-viewer/virt-viewer
Source0: https://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.xz Source0: https://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.xz
Patch: 0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch
Requires: openssh-clients Requires: openssh-clients
# Our bash completion script uses virsh to list domains # Our bash completion script uses virsh to list domains
@ -89,12 +87,6 @@ the display, and libvirt for looking up VNC/SPICE server details.
%{_datadir}/bash-completion/completions/virt-viewer %{_datadir}/bash-completion/completions/virt-viewer
%changelog %changelog
* Tue Aug 16 2024 Dmitry Samoylik <Dmitriy.Samoylik@softline.com> - 11.0-1.inferit
- SPICE enable
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 11.0-1
- Rebuilt for MSVSphere 9.1.
* Wed Dec 8 2021 Daniel P. Berrangé <berrange@redhat.com> - 11.0-1 * Wed Dec 8 2021 Daniel P. Berrangé <berrange@redhat.com> - 11.0-1
- Rebase to 11.0 release - Rebase to 11.0 release
- Add missing dep on libvirt-client for bash completion - Add missing dep on libvirt-client for bash completion

Loading…
Cancel
Save