1
0

- 1299.patch: fixes build with new PF5

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit-podman?expand=0&rev=31
This commit is contained in:
Adam Majer 2023-06-16 11:39:14 +00:00 committed by Git OBS Bridge
parent 8049a24412
commit 4077717f9e
6 changed files with 2169 additions and 45 deletions

2118
1299.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,9 @@ Fri Jun 16 10:18:09 UTC 2023 - Adam Majer <adam.majer@suse.de>
* Create new pod group functionality * Create new pod group functionality
* Show all containers by default * Show all containers by default
* Stability and performance improvements * Stability and performance improvements
- load-css-overrides.patch: refreshed - load-css-overrides.patch: refreshed
- 1299.patch: fixes build with new PF5
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 20 10:11:52 UTC 2022 - Adam Majer <adam.majer@suse.de> Tue Sep 20 10:11:52 UTC 2022 - Adam Majer <adam.majer@suse.de>

View File

@ -26,7 +26,8 @@ Source: https://github.com/cockpit-project/cockpit-podman/archive/%{vers
Source10: package-lock.json Source10: package-lock.json
Source11: node_modules.spec.inc Source11: node_modules.spec.inc
%include %_sourcedir/node_modules.spec.inc %include %_sourcedir/node_modules.spec.inc
Patch1: load-css-overrides.patch Patch1: 1299.patch
Patch10: load-css-overrides.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: appstream-glib BuildRequires: appstream-glib
Requires: cockpit-bridge >= 138 Requires: cockpit-bridge >= 138
@ -46,12 +47,14 @@ rm -r node_modules
local-npm-registry %{_sourcedir} install --with=dev local-npm-registry %{_sourcedir} install --with=dev
%build %build
export PREFIX=%{_prefix}
mkdir -p pkg/lib mkdir -p pkg/lib
cp -r %{_datadir}/cockpit/devel/lib/* pkg/lib cp -r %{_datadir}/cockpit/devel/lib/* pkg/lib
npm run build npm run build
%install %install
export PREFIX=%{_prefix}
%make_install %make_install
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/* appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*

BIN
node_modules.obscpio (Stored with Git LFS)

Binary file not shown.

View File

@ -67,12 +67,12 @@ Source10065: https://registry.npmjs.org/@jridgewell/trace-mapping/-/trac
Source10066: https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#/@nodelib-fs.scandir-2.1.5.tgz Source10066: https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#/@nodelib-fs.scandir-2.1.5.tgz
Source10067: https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#/@nodelib-fs.stat-2.0.5.tgz Source10067: https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#/@nodelib-fs.stat-2.0.5.tgz
Source10068: https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#/@nodelib-fs.walk-1.2.8.tgz Source10068: https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#/@nodelib-fs.walk-1.2.8.tgz
Source10069: https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.0-alpha.43.tgz#/@patternfly-patternfly-5.0.0-alpha.43.tgz Source10069: https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.0-alpha.53.tgz#/@patternfly-patternfly-5.0.0-alpha.53.tgz
Source10070: https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.0.0-alpha.83.tgz#/@patternfly-react-core-5.0.0-alpha.83.tgz Source10070: https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.0.0-alpha.98.tgz#/@patternfly-react-core-5.0.0-alpha.98.tgz
Source10071: https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.0.0-alpha.12.tgz#/@patternfly-react-icons-5.0.0-alpha.12.tgz Source10071: https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.0.0-alpha.14.tgz#/@patternfly-react-icons-5.0.0-alpha.14.tgz
Source10072: https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-5.0.0-alpha.8.tgz#/@patternfly-react-styles-5.0.0-alpha.8.tgz Source10072: https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-5.0.0-alpha.10.tgz#/@patternfly-react-styles-5.0.0-alpha.10.tgz
Source10073: https://registry.npmjs.org/@patternfly/react-table/-/react-table-5.0.0-alpha.85.tgz#/@patternfly-react-table-5.0.0-alpha.85.tgz Source10073: https://registry.npmjs.org/@patternfly/react-table/-/react-table-5.0.0-alpha.100.tgz#/@patternfly-react-table-5.0.0-alpha.100.tgz
Source10074: https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-5.0.0-prerelease.4.tgz#/@patternfly-react-tokens-5.0.0-prerelease.4.tgz Source10074: https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-5.0.0-alpha.9.tgz#/@patternfly-react-tokens-5.0.0-alpha.9.tgz
Source10075: https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz#/@types-json5-0.0.29.tgz Source10075: https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz#/@types-json5-0.0.29.tgz
Source10076: https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz#/@types-minimist-1.2.2.tgz Source10076: https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz#/@types-minimist-1.2.2.tgz
Source10077: https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#/@types-normalize-package-data-2.4.1.tgz Source10077: https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#/@types-normalize-package-data-2.4.1.tgz
@ -214,7 +214,7 @@ Source10212: https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tg
Source10213: https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz#/find-up-5.0.0.tgz Source10213: https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz#/find-up-5.0.0.tgz
Source10214: https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz#/flat-cache-3.0.4.tgz Source10214: https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz#/flat-cache-3.0.4.tgz
Source10215: https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz#/flatted-3.2.7.tgz Source10215: https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz#/flatted-3.2.7.tgz
Source10216: https://registry.npmjs.org/focus-trap/-/focus-trap-7.4.0.tgz#/focus-trap-7.4.0.tgz Source10216: https://registry.npmjs.org/focus-trap/-/focus-trap-7.4.1.tgz#/focus-trap-7.4.1.tgz
Source10217: https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz#/for-each-0.3.3.tgz Source10217: https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz#/for-each-0.3.3.tgz
Source10218: https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz#/fs-extra-10.1.0.tgz Source10218: https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz#/fs-extra-10.1.0.tgz
Source10219: https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#/fs.realpath-1.0.0.tgz Source10219: https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#/fs.realpath-1.0.0.tgz

71
package-lock.json generated
View File

@ -7,11 +7,12 @@
"name": "podman", "name": "podman",
"license": "LGPL-2.1", "license": "LGPL-2.1",
"dependencies": { "dependencies": {
"@patternfly/patternfly": "5.0.0-alpha.43", "@patternfly/patternfly": "5.0.0-alpha.53",
"@patternfly/react-core": "5.0.0-alpha.83", "@patternfly/react-core": "5.0.0-alpha.98",
"@patternfly/react-icons": "5.0.0-alpha.12", "@patternfly/react-icons": "5.0.0-alpha.14",
"@patternfly/react-styles": "5.0.0-alpha.8", "@patternfly/react-styles": "5.0.0-alpha.10",
"@patternfly/react-table": "5.0.0-alpha.85", "@patternfly/react-table": "5.0.0-alpha.100",
"@patternfly/react-tokens": "5.0.0-alpha.9",
"date-fns": "2.28.0", "date-fns": "2.28.0",
"docker-names": "1.2.1", "docker-names": "1.2.1",
"prop-types": "15.8.1", "prop-types": "15.8.1",
@ -1038,19 +1039,19 @@
} }
}, },
"node_modules/@patternfly/patternfly": { "node_modules/@patternfly/patternfly": {
"version": "5.0.0-alpha.43", "version": "5.0.0-alpha.53",
"resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.0-alpha.43.tgz", "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.0-alpha.53.tgz",
"integrity": "sha512-O3tOXGTxNbR8AOAiJUIth/0MAiKniTvM2L//lDisRXst0fP43I7/p0Ba3hU3ECAfMf4MsIe9tt5ZhO5Hz9lpZg==" "integrity": "sha512-sy9lk98PLVGjFuJ6li9uIwKc/IXXhjv8Ow0Q/MDOCFrhnj2gWLjMr4uB4d0393mAGfD1vk8KkqF+7tfEDIBjpQ=="
}, },
"node_modules/@patternfly/react-core": { "node_modules/@patternfly/react-core": {
"version": "5.0.0-alpha.83", "version": "5.0.0-alpha.98",
"resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.0.0-alpha.83.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.0.0-alpha.98.tgz",
"integrity": "sha512-z2Erly7inGlRXgrJ79AmvQy7JfzqOLKoen+V6ko8zaIQWAluxZdgZppw/PX5fyj3Hi55sBN/GsDV8fD+o/LxbA==", "integrity": "sha512-LouTqxWPtvzK3834i1JW5kTjDoqIWnvbioZaRIJOuL3eGgBYk+ORpoa9EZ8j4r+NQWxeogMFgxzsP9Oe04xjcQ==",
"dependencies": { "dependencies": {
"@patternfly/react-icons": "^5.0.0-alpha.12", "@patternfly/react-icons": "^5.0.0-alpha.14",
"@patternfly/react-styles": "^5.0.0-alpha.8", "@patternfly/react-styles": "^5.0.0-alpha.10",
"@patternfly/react-tokens": "^5.0.0-alpha.7", "@patternfly/react-tokens": "^5.0.0-alpha.9",
"focus-trap": "7.4.0", "focus-trap": "7.4.1",
"react-dropzone": "^14.2.3", "react-dropzone": "^14.2.3",
"tslib": "^2.5.0" "tslib": "^2.5.0"
}, },
@ -1060,28 +1061,28 @@
} }
}, },
"node_modules/@patternfly/react-icons": { "node_modules/@patternfly/react-icons": {
"version": "5.0.0-alpha.12", "version": "5.0.0-alpha.14",
"resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.0.0-alpha.12.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.0.0-alpha.14.tgz",
"integrity": "sha512-VwCGlB+JtpsjHJtqCcfy+CpaE+rAY2si7cd4ufJouybkoBPve/6wuTPA3K3eGtgn5cAIr18IF1Pkfkp2lR18sg==", "integrity": "sha512-+FXETYc+x0xKqktrcgrpxPTZgtaJ6rfpObu/qM4YGuwXkJRIu0OJaoNQTPH9QsxKAeZ+VUh9CnhOcNTRfq9plA==",
"peerDependencies": { "peerDependencies": {
"react": "^17 || ^18", "react": "^17 || ^18",
"react-dom": "^17 || ^18" "react-dom": "^17 || ^18"
} }
}, },
"node_modules/@patternfly/react-styles": { "node_modules/@patternfly/react-styles": {
"version": "5.0.0-alpha.8", "version": "5.0.0-alpha.10",
"resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-5.0.0-alpha.8.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-5.0.0-alpha.10.tgz",
"integrity": "sha512-V/jhoKp6pz3c+2N1Yi/Ez/EJIHKEHe4SSCzF5ocGpOfaYlQpDGdttKIF0GSWksXlShYZJ5heKfARuESK9XjqRA==" "integrity": "sha512-SJsLPtTKE1u6YpEAvx+zUre+u9poc/IIIKJ9dk0Jze94HtC/2kI4fhhvm2iQE5Z4rNAPrFlC4fVsvbr7skS3kg=="
}, },
"node_modules/@patternfly/react-table": { "node_modules/@patternfly/react-table": {
"version": "5.0.0-alpha.85", "version": "5.0.0-alpha.100",
"resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-5.0.0-alpha.85.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-5.0.0-alpha.100.tgz",
"integrity": "sha512-rFpHkEwWstAMt4qg7YTWHYODb/NeySSaMhIWdAspvtWVU+hWkD02ejQ0eIlHSghLLKqXNsxICS1TcyDLShuyvw==", "integrity": "sha512-w3phwe/O8tc5Lxy9KnIXsE5VxanyjwCPeVxWZCWOqWWeiokJoANX5dWI2RdVrDdauQGYohsmYs4+93OYhhSI8A==",
"dependencies": { "dependencies": {
"@patternfly/react-core": "^5.0.0-alpha.83", "@patternfly/react-core": "^5.0.0-alpha.98",
"@patternfly/react-icons": "^5.0.0-alpha.12", "@patternfly/react-icons": "^5.0.0-alpha.14",
"@patternfly/react-styles": "^5.0.0-alpha.8", "@patternfly/react-styles": "^5.0.0-alpha.10",
"@patternfly/react-tokens": "^5.0.0-alpha.7", "@patternfly/react-tokens": "^5.0.0-alpha.9",
"lodash": "^4.17.19", "lodash": "^4.17.19",
"tslib": "^2.5.0" "tslib": "^2.5.0"
}, },
@ -1091,9 +1092,9 @@
} }
}, },
"node_modules/@patternfly/react-tokens": { "node_modules/@patternfly/react-tokens": {
"version": "5.0.0-prerelease.4", "version": "5.0.0-alpha.9",
"resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-5.0.0-prerelease.4.tgz", "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-5.0.0-alpha.9.tgz",
"integrity": "sha512-bg+ABSLRflyLltv9+fx3w/cyF9i/eWy1/m1SNgeBMtJtfOgl+RLKejChYQ/PPYHoFaxllbPBamgWbi6YppD4Ew==" "integrity": "sha512-8P8u9BJdQmiunZbGAlDIunlGI6D4V81YZA16z9hw5qXReWztWyF9IXXB4L6lG5+VJZEnocBpJPenNJ1n1FmiBQ=="
}, },
"node_modules/@types/json5": { "node_modules/@types/json5": {
"version": "0.0.29", "version": "0.0.29",
@ -2938,11 +2939,11 @@
"dev": true "dev": true
}, },
"node_modules/focus-trap": { "node_modules/focus-trap": {
"version": "7.4.0", "version": "7.4.1",
"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.4.0.tgz", "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.4.1.tgz",
"integrity": "sha512-yI7FwUqU4TVb+7t6PaQ3spT/42r/KLEi8mtdGoQo2li/kFzmu9URmalTvw7xCCJtSOyhBxscvEAmvjeN9iHARg==", "integrity": "sha512-rnXP5ERIjlo1gEZp7hQb4ekYqUxRuSDQeyWvxhahH3/GkWtd8h8g1C8Eu/KGpuvbUWNVeogK0kuzzrM4u2Z9jA==",
"dependencies": { "dependencies": {
"tabbable": "^6.1.1" "tabbable": "^6.1.2"
} }
}, },
"node_modules/for-each": { "node_modules/for-each": {