Merge branch '5.0.7'

Author: arlake228

toolkit/perfsonar-toolkit/unibuild-packaging/rpm/perfsonar-toolkit.spec

@@ -17,7 +17,7 @@
 %define crontab_1     cron-service_watcher
 
 %define perfsonar_auto_version 5.0.7
-%define perfsonar_auto_relnum 1
+%define perfsonar_auto_relnum 2
 
 Name:           perfsonar-toolkit
 Version:        %{perfsonar_auto_version}
@@ -146,8 +146,12 @@ Requires(post): coreutils
 Requires(post): httpd
 Requires(post): iperf
 Requires(post): mod_ssl
+#EL8 puts this in systemd, EL7 and EL9 in systemd-resolved
+%if 0%{?el8}
+Requires(post): systemd
+%else
 Requires(post): systemd-resolved
-
+%endif
 
 %description
 The perfSONAR Toolkit web GUI and associated services.
@@ -156,7 +160,12 @@ The perfSONAR Toolkit web GUI and associated services.
 Summary:        perfSONAR Testpoint System Configuration
 Group:          Development/Tools
 Requires:       perfsonar-psconfig-pscheduler
-Requires:       systemd-resolved
+#EL8 puts this in systemd, EL7 and EL9 in systemd-resolved
+%if 0%{?el8}
+Requires: systemd
+%else
+Requires: systemd-resolved
+%endif
 %if 0%{?el7}
 Requires:       yum-cron
 %else