Merge pull request #49 from 45Drives/fix-import-paternfly

include cockpit.css with plugin dist to fix break from Cockpit 273 and higher no longer supplying it.
45Drives · Aug 5, 2022 · d70d66f · d70d66f
2 parents ba615bd + 2240762
commit d70d66f
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,3 @@
-## Cockpit Navigator 0.5.8-2
+## Cockpit Navigator 0.5.9-1
 
-* Add file and coreutils dependencies.
+* Fix CSS for Cockpit 273 and greater
diff --git a/manifest.json b/manifest.json
@@ -3,8 +3,8 @@
     "name": "cockpit-navigator",
     "title": "Cockpit Navigator",
     "prerelease": false,
-    "version": "0.5.8",
-    "buildVersion": "2",
+    "version": "0.5.9",
+    "buildVersion": "1",
     "author": "Josh Boudreau <jboudreau@45drives.com>",
     "url": "https://github.com/45Drives/cockpit-navigator",
     "category": "utils",
@@ -59,8 +59,8 @@
     ],
     "changelog": {
         "urgency": "medium",
-        "version": "0.5.8",
-        "buildVersion": "2",
+        "version": "0.5.9",
+        "buildVersion": "1",
         "ignore": [],
         "date": null,
         "packager": "Josh Boudreau <jboudreau@45drives.com>",

diff --git a/navigator/cockpit.css.gz b/navigator/cockpit.css.gz
diff --git a/navigator/index.html b/navigator/index.html
@@ -22,7 +22,7 @@
 	<meta charset="utf-8">
 	<base href=".">
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-	<link href="../base1/cockpit.css" type="text/css" rel="stylesheet">
+	<link rel="stylesheet" type="text/css" href="./cockpit.css">
 	<link href="style.css" type="text/css" rel="stylesheet">
 	<link href="fontawesome/css/all.min.css" rel="stylesheet">
 	<script src="fontawesome/attribution.js"></script>

diff --git a/packaging/el7/main.spec b/packaging/el7/main.spec
@@ -32,6 +32,8 @@ rm -rf %{buildroot}
 /usr/share/cockpit/navigator/*
 
 %changelog
+* Fri Aug 05 2022 Joshua Boudreau <jboudreau@45drives.com> 0.5.9-1
+- Fix CSS for Cockpit 273 and greater
 * Mon Jun 06 2022 Joshua Boudreau <jboudreau@45drives.com> 0.5.8-2
 - Add file and coreutils dependencies.
 * Wed Dec 01 2021 Joshua Boudreau <jboudreau@45drives.com> 0.5.8-1

diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec
@@ -32,6 +32,8 @@ rm -rf %{buildroot}
 /usr/share/cockpit/navigator/*
 
 %changelog
+* Fri Aug 05 2022 Joshua Boudreau <jboudreau@45drives.com> 0.5.9-1
+- Fix CSS for Cockpit 273 and greater
 * Mon Jun 06 2022 Joshua Boudreau <jboudreau@45drives.com> 0.5.8-2
 - Add file and coreutils dependencies.
 * Wed Dec 01 2021 Joshua Boudreau <jboudreau@45drives.com> 0.5.8-1

diff --git a/packaging/focal/changelog b/packaging/focal/changelog
@@ -1,3 +1,9 @@
+cockpit-navigator (0.5.9-1focal) focal; urgency=medium
+
+  * Fix CSS for Cockpit 273 and greater
+
+ -- Joshua Boudreau <jboudreau@45drives.com>  Fri, 05 Aug 2022 12:53:34 -0300
+
 cockpit-navigator (0.5.8-2focal) focal; urgency=medium
 
   * Add file and coreutils dependencies.