cockpit/cockpit-machines
SHA256
2
0
Fork 1
forked from pool/cockpit-machines
Code Pull Requests Activity

Accepting request 979392 from systemsmanagement:cockpit

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/979392
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cockpit-machines?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2022-05-26 19:45:17 +00:00 committed by Git OBS Bridge
commit 018f3038d8
3 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cockpit-machines.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 19 18:10:51 UTC 2022 - Jacek Tomasiak <jtomasiak@suse.com>
- Add suse-vv-install.patch to display SUSE hint for virt-viewer
installation (bsc#1199673)
-------------------------------------------------------------------
Mon Mar 14 22:37:04 UTC 2022 - Jacek Tomasiak <jtomasiak@suse.com>

7
cockpit-machines.spec
View File

@ -29,6 +29,8 @@ Source10: package-lock.json
Source11: node_modules.spec.inc
%include %_sourcedir/node_modules.spec.inc
Patch0: hide-docs.patch
# patches for node modules start with 100
Patch100: suse-vv-install.patch
BuildArch: noarch
BuildRequires: appstream-glib
BuildRequires: make
@ -56,11 +58,12 @@ Cockpit component for managing virtual machines.
If "virt-install" is installed, you can also create new virtual machines.
%prep
%autosetup -p1 -n %{name}
%setup -n %{name}
%patch0 -p1
rm -f package-lock.json
local-npm-registry %{_sourcedir} install --with=dev --legacy-peer-deps || ( find ~/.npm/_logs -name '*-debug.log' -print0 | xargs -0 cat; false)
%patch100 -p1
%build
cp -r %{_datadir}/cockpit/devel/lib src/lib

36
suse-vv-install.patch Normal file
View File

@ -0,0 +1,36 @@
diff --git a/node_modules/@patternfly/react-console/dist/esm/components/DesktopViewer/MoreInformationDefaultContent.js b/node_modules/@patternfly/react-console/dist/esm/components/DesktopViewer/MoreInformationDefaultContent.js
index fef60fe..47f02b6 100644
--- a/node_modules/@patternfly/react-console/dist/esm/components/DesktopViewer/MoreInformationDefaultContent.js
+++ b/node_modules/@patternfly/react-console/dist/esm/components/DesktopViewer/MoreInformationDefaultContent.js
@@ -12,6 +12,7 @@ export const MoreInformationDefaultContent = ({ textMoreInfoContent = (React.cre
React.createElement(DescriptionList, { isHorizontal: true },
React.createElement(MoreInformationInstallVariant, { os: "RHEL, CentOS", content: "sudo yum install virt-viewer" }),
React.createElement(MoreInformationInstallVariant, { os: "Fedora", content: "sudo dnf install virt-viewer" }),
+ React.createElement(MoreInformationInstallVariant, { os: "SLE, openSUSE", content: "sudo zypper install virt-viewer" }),
React.createElement(MoreInformationInstallVariant, { os: "Ubuntu, Debian", content: "sudo apt-get install virt-viewer" }),
React.createElement(MoreInformationInstallVariant, { os: "Windows" },
React.createElement("div", null,
diff --git a/node_modules/@patternfly/react-console/dist/js/components/DesktopViewer/MoreInformationDefaultContent.js b/node_modules/@patternfly/react-console/dist/js/components/DesktopViewer/MoreInformationDefaultContent.js
index d74617f..30e58aa 100644
--- a/node_modules/@patternfly/react-console/dist/js/components/DesktopViewer/MoreInformationDefaultContent.js
+++ b/node_modules/@patternfly/react-console/dist/js/components/DesktopViewer/MoreInformationDefaultContent.js
@@ -16,6 +16,7 @@ exports.MoreInformationDefaultContent = ({ textMoreInfoContent = (react_1.defaul
react_1.default.createElement(react_core_1.DescriptionList, { isHorizontal: true },
react_1.default.createElement(MoreInformationInstallVariant_1.MoreInformationInstallVariant, { os: "RHEL, CentOS", content: "sudo yum install virt-viewer" }),
react_1.default.createElement(MoreInformationInstallVariant_1.MoreInformationInstallVariant, { os: "Fedora", content: "sudo dnf install virt-viewer" }),
+ react_1.default.createElement(MoreInformationInstallVariant_1.MoreInformationInstallVariant, { os: "SLE, openSUSE", content: "sudo zypper install virt-viewer" }),
react_1.default.createElement(MoreInformationInstallVariant_1.MoreInformationInstallVariant, { os: "Ubuntu, Debian", content: "sudo apt-get install virt-viewer" }),
react_1.default.createElement(MoreInformationInstallVariant_1.MoreInformationInstallVariant, { os: "Windows" },
react_1.default.createElement("div", null,
diff --git a/node_modules/@patternfly/react-console/src/components/DesktopViewer/MoreInformationDefaultContent.tsx b/node_modules/@patternfly/react-console/src/components/DesktopViewer/MoreInformationDefaultContent.tsx
index 02db247..68fb507 100644
--- a/node_modules/@patternfly/react-console/src/components/DesktopViewer/MoreInformationDefaultContent.tsx
+++ b/node_modules/@patternfly/react-console/src/components/DesktopViewer/MoreInformationDefaultContent.tsx
@@ -24,6 +24,7 @@ export const MoreInformationDefaultContent: React.FunctionComponent<MoreInformat
<DescriptionList isHorizontal>
<MoreInformationInstallVariant os="RHEL, CentOS" content="sudo yum install virt-viewer" />
<MoreInformationInstallVariant os="Fedora" content="sudo dnf install virt-viewer" />
+ <MoreInformationInstallVariant os="SLE, openSUSE" content="sudo zypper install virt-viewer" />
<MoreInformationInstallVariant os="Ubuntu, Debian" content="sudo apt-get install virt-viewer" />
<MoreInformationInstallVariant os="Windows">
<div>