PR#4: Fix failure of nut-client to install on EL8 due to missing pygtk2 - rpms/nut

		`@@ -1,13 +1,14 @@`
		`%global _hardened_build 1`
		`#global with_python2 0`
		`- %bcond_with python2`
		`+ #EL8 doesn't have pygtk2`
		`+ #%bcond_with python2`

		`#TODO: split nut-client so it does not require python`
		`%global nut_uid 57`
		`%global nut_gid 57`

		`%global cgidir /var/www/nut-cgi-bin`
		`- %global piddir /var/run/nut`
		`+ %global piddir /run/nut`
		`%global modeldir /usr/sbin`
		`# powerman is retired on Fedora, therefore disable it by default`
		`%bcond_with powerman`
		`@@ -15,7 +16,7 @@`
		`Summary: Network UPS Tools`
		`Name: nut`
		`Version: 2.7.4`
		`- Release: 26%{?dist}`
		`+ Release: 28%{?dist}`
		`License: GPLv2+ and GPLv3+`
		`Url: http://www.networkupstools.org/`
		`Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz`
		`@@ -75,7 +76,7 @@`

		`ExcludeArch: s390 s390x`

		`- %global restart_flag /var/run/%{name}/%{name}-restart-after-rpm-install`
		`+ %global restart_flag /run/%{name}/%{name}-restart-after-rpm-install`

		`%description`
		`These programs are part of a developing project to monitor the assortment`
		`@@ -441,6 +442,12 @@`
		`%{_libdir}/pkgconfig/libnutscan.pc`

		`%changelog`
		`+ * Fri Oct 11 2019 Tim Jackson <rpm@timj.co.uk> - 2.7.4-28`
		`+ - Fix location of runtime files: now in /run instead of /var/run`
		`+`
		`+ * Fri Oct 11 2019 Tim Jackson <rpm@timj.co.uk> - 2.7.4-27`
		`+ - Build without python2 for EL8`
		`+`
		`* Fri Oct 04 2019 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-26`
		`- drop pygtk2 requirements`

package.cfg

file added

		`@@ -0,0 +1,2 @@`
		`+ [koji]`
		`+ targets = epel8 epel8-playground`

ups.init

file modified

+4 -4

		`@@ -51,14 +51,14 @@`
		`echo`

		`echo -n $"Starting UPS monitor (master): "`
		`- daemon --pidfile /var/run/nut/upsmon.pid /usr/sbin/upsmon > /dev/null 2>&1 && success \|\| failure`
		`+ daemon --pidfile /run/nut/upsmon.pid /usr/sbin/upsmon > /dev/null 2>&1 && success \|\| failure`
		`if [ "$RETVAL" = 0 ]; then`
		`RETVAL=$?`
		`fi`
		`echo`
		`else`
		`echo -n $"Starting UPS monitor (slave): "`
		`- daemon --pidfile /var/run/nut/upsmon.pid /usr/sbin/upsmon > /dev/null 2>&1 && success \|\| failure`
		`+ daemon --pidfile /run/nut/upsmon.pid /usr/sbin/upsmon > /dev/null 2>&1 && success \|\| failure`
		`echo`
		`fi`

		`@@ -67,7 +67,7 @@`

		`stop() {`
		`echo -n $"Stopping UPS monitor: "`
		`- killproc -p /var/run/nut/upsmon.pid upsmon`
		`+ killproc -p /run/nut/upsmon.pid upsmon`
		`echo`

		`if [ "$SERVER" = "yes" ]; then`
		`@@ -90,7 +90,7 @@`
		`restart() {`
		`stop`
		`waitmore=5`
		`- while [ -n "$(ls /var/run/nut/)" -a $waitmore -ge 1 ]`
		`+ while [ -n "$(ls /run/nut/)" -a $waitmore -ge 1 ]`
		`do`
		`sleep 1`
		`waitmore=$((waitmore-1))`