track system command dependencies and set up packaging

manifest.json

@@ -1,8 +1,8 @@
 {
-    "__version": "45D-R1",
+    "__version": "45D-R2",
     "name": "cockpit-file-sharing",
     "title": "Cockpit File Sharing",
-    "prerelease": false,
+    "prerelease": true,
     "version": "3.3.7",
     "buildVersion": "1",
     "author": "Josh Boudreau <[email protected]>",
@@ -22,29 +22,34 @@
         "urgency": "medium"
     },
     "dependencies": {
-        "deb": [
-            "cockpit",
-            "attr",
-            "coreutils",
-            "libc-bin",
-            "nfs-kernel-server",
-            "samba",
-            "samba-common-bin",
-            "systemd",
-            "winbind",
-            "gawk"
-        ],
-        "el": [
-            "cockpit",
-            "attr",
-            "coreutils",
-            "glibc-common",
-            "nfs-utils",
-            "samba-common-tools",
-            "samba-winbind-clients",
-            "systemd",
-            "gawk"
-        ]
+        "deb": {
+            "focal": [
+                "cockpit-bridge",
+                "coreutils",
+                "attr",
+                "findutils",
+                "hostname",
+                "iproute2",
+                "libc-bin",
+                "systemd",
+                "nfs-kernel-server",
+                "samba-common-bin"
+            ]
+        },
+        "el": {
+            "el8": [
+                "cockpit-bridge",
+                "coreutils",
+                "attr",
+                "findutils",
+                "hostname",
+                "iproute",
+                "glibc-common",
+                "systemd",
+                "nfs-utils",
+                "samba-common-tools"
+            ]
+        }
     },
     "releases": [
         {
@@ -67,4 +72,4 @@
         "packager": "Josh Boudreau <[email protected]>",
         "changes": []
     }
-}
+}

packaging/el8/main.spec

@@ -6,7 +6,7 @@ License: ::package_licence::
 URL: ::package_url::
 Source0: %{name}-%{version}.tar.gz
 BuildArch: ::package_architecture_el::
-Requires: ::package_dependencies_el::
+Requires: ::package_dependencies_el_el8::
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -182,4 +182,4 @@ make DESTDIR=%{buildroot} install
 * Wed Aug 11 2021 Sam Silver <[email protected]> 2.0.0-1
 - A code refactor and UI redesign of NFS Manager.
 * Mon Jul 05 2021 Sam Silver <[email protected]> 1.0.0-1
-- Initial packaging
+- Initial packaging

packaging/focal/control

@@ -8,5 +8,5 @@ Homepage: ::package_url::
 
 Package: ::package_name::
 Architecture: ::package_architecture_deb::
-Depends: ::package_dependencies_deb::
+Depends: ::package_dependencies_deb_focal::
 Description: ::package_description_short::

packaging/focal/copyright

@@ -4,14 +4,6 @@ Upstream-Contact: ::package_author::
 Source: ::package_url::
 
 Files: *
-Copyright: 2021 Sam Silver <[email protected]>
-License: GPL-3.0+
-
-Files: file-sharing/branding/*
-Copyright: 2021 Josh Boudreau <[email protected]>
-License: GPL-3.0+
-
-Files: file-sharing/samba-manager/*
 Copyright: 2021 Josh Boudreau <[email protected]>
 License: GPL-3.0+
 

system_dependencies.txt

@@ -0,0 +1,16 @@
+all of houston-common/system_dependencies.txt, plus:
+
+commands:
+systemctl
+exportfs
+net
+
+RHEL 8:
+systemd - systemctl
+nfs-utils - exportfs
+samba-common-tools - net
+
+Ubuntu Focal:
+systemd - systemctl
+nfs-kernel-server - exportfs
+samba-common-bin - net