Accepting request 1206666 from hardware

OBS-URL: https://build.opensuse.org/request/show/1206666
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nut?expand=0&rev=80

nut-2.8.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e4b4b0cbe7dd39ba9097be7f7d787bb2fffbe35df64dff53b5fe393d659c597d
-size 5599935

nut.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Sep 29 20:50:24 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
+
+- Add /srv/www directories to filelist [bsc#1231027]
+
+-------------------------------------------------------------------
+Thu Sep 12 13:43:51 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>
+
+- Eaton scripts were mistakenly shipped by upstream with a proprietary
+  license. Repack with upstream re-licensing patch (gh#2623).
+  * nut-2.8.2-repack.tar.gz
+- Add missing %service_* calls
+
 -------------------------------------------------------------------
 Sat Apr  6 20:59:56 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>
 

nut.spec

@@ -61,8 +61,8 @@ Summary:        Network UPS Tools Core (Uninterruptible Power Supply Monitoring)
 License:        GPL-2.0-or-later
 Group:          Hardware/UPS
 URL:            https://www.networkupstools.org/
-Source0:        https://github.com/networkupstools/nut/releases/download/v%{version}/%{name}-%{version}.tar.gz
-Source1:        https://github.com/networkupstools/nut/releases/download/v%{version}/%{name}-%{version}.tar.gz.sig
+# Repack with upstream PR #2623 patched in due to files with proprietary license
+Source0:        %{name}-%{version}-repack.tar.gz
 Source2:        README.SUSE
 Source3:        nut.rpmlintrc
 Source4:        nut.keyring
@@ -71,9 +71,9 @@ Patch0:         nut-preconfig.patch
 Patch1:         nut-notifyflag.patch
 # PATCH-FEATURE-OPENSUSE nut-doc-fixed-date.patch sbrabec@suse.cz -- Make doc builds reproducible.
 Patch2:         nut-doc-fixed-date.patch
-Patch10:        harden_nut-driver.service.patch
-Patch11:        harden_nut-monitor.service.patch
-Patch12:        harden_nut-server.service.patch
+Patch3:         harden_nut-driver.service.patch
+Patch4:         harden_nut-monitor.service.patch
+Patch5:         harden_nut-server.service.patch
 BuildRequires:  apache-rpm-macros
 BuildRequires:  asciidoc
 BuildRequires:  fdupes
@@ -392,7 +392,7 @@ rm -f %{buildroot}%{_docdir}/%{name}/cables/*.txt-prepped
 %if 0%{?suse_version} < 1330
 getent passwd %{NUT_USER} >/dev/null || useradd -r -g %{NUT_GROUP} -s /bin/false -c "UPS daemon" -d /sbin %{NUT_USER} 2>/dev/null
 %endif
-%service_add_pre nut-server.service nut-monitor.service nut-driver-enumerator.path nut-driver-enumerator.service nut-driver.target nut.target
+%service_add_pre nut-server.service nut-monitor.service nut-driver-enumerator.path nut-driver-enumerator.service nut-driver.target nut.target nut-driver-enumerator-daemon-activator.path nut-driver-enumerator-daemon-activator.service nut-driver-enumerator-daemon.service
 
 %post
 # Generate initial passwords.
@@ -417,14 +417,14 @@ if grep "powersave -U" %{_sysconfdir}/ups/upsmon.conf ; then
 fi
 # And finally trigger udev to set permissions according to newly installed rules files.
 udevadm trigger --subsystem-match=usb --property-match=DEVTYPE=usb_device
-%service_add_post nut-server.service nut-monitor.service nut-driver-enumerator.path nut-driver-enumerator.service nut-driver.target nut.target
+%service_add_post nut-server.service nut-monitor.service nut-driver-enumerator.path nut-driver-enumerator.service nut-driver.target nut.target nut-driver-enumerator-daemon-activator.path nut-driver-enumerator-daemon-activator.service nut-driver-enumerator-daemon.service
 %tmpfiles_create %{_tmpfilesdir}/%{name}-common-tmpfiles.conf
 
 %preun
-%service_del_preun nut-server.service nut-monitor.service nut-driver-enumerator.path nut-driver-enumerator.service nut-driver.target nut.target
+%service_del_preun nut-server.service nut-monitor.service nut-driver-enumerator.path nut-driver-enumerator.service nut-driver.target nut.target nut-driver-enumerator-daemon-activator.path nut-driver-enumerator-daemon-activator.service nut-driver-enumerator-daemon.service
 
 %postun
-%service_del_postun nut-server.service nut-monitor.service nut-driver-enumerator.path nut-driver-enumerator.service nut-driver.target nut.target
+%service_del_postun nut-server.service nut-monitor.service nut-driver-enumerator.path nut-driver-enumerator.service nut-driver.target nut.target nut-driver-enumerator-daemon-activator.path nut-driver-enumerator-daemon-activator.service nut-driver-enumerator-daemon.service
 
 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400
 %ldconfig_scriptlets -n libnutclient2
@@ -500,6 +500,9 @@ udevadm trigger --subsystem-match=usb --property-match=DEVTYPE=usb_device
 %{_libdir}/libupsclient.so.*
 
 %files cgi
+%dir %{apache_serverroot}
+%dir %{apache_serverroot}/cgi-bin
+%dir %{apache_serverroot}/htdocs
 %{CGIPATH}
 %{HTMLPATH}
 %config(noreplace) %{CONFPATH}/upsstats-single.html