From 345fadb5d2fad3163c10c2c8a7ef0ec5268ff70c Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 19 Feb 2025 11:36:39 +0100 Subject: [PATCH 01/12] build for epel10, trim changelog --- nut.spec | 327 +++---------------------------------------------------- 1 file changed, 15 insertions(+), 312 deletions(-) diff --git a/nut.spec b/nut.spec index 2d04cd3..71e0d60 100644 --- a/nut.spec +++ b/nut.spec @@ -14,7 +14,7 @@ Summary: Network UPS Tools Name: nut Version: 2.8.2.1 -Release: 5%{?dist}.1.git20240703pr2505 +Release: 0%{?dist}.1.git20240703pr2505 License: GPL-2.0-or-later AND GPL-3.0-or-later Url: https://www.networkupstools.org/ Source: https://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz @@ -47,16 +47,15 @@ BuildRequires: freetype-devel BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gd-devel -%if 0%{?fedora} < 39 -BuildRequires: libgpiod-devel -%endif +# not available in epel atm +#BuildRequires: libgpiod-devel +#BuildRequires: libmodbus-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtool BuildRequires: libtool-ltdl-devel BuildRequires: libX11-devel BuildRequires: libXpm-devel -BuildRequires: libmodbus-devel BuildRequires: libi2c-devel BuildRequires: neon-devel BuildRequires: net-snmp-devel @@ -162,6 +161,8 @@ export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" export LDFLAGS="-Wl,-z,now" %configure \ --with-all \ + --without-modbus \ + --without-gpio \ %if %{without powerman} --without-powerman \ %endif @@ -334,8 +335,8 @@ fi %{_mandir}/man8/nutconf.8.gz -%{_mandir}/man8/adelsystem_cbi.8.gz -%{_mandir}/man8/apc_modbus.8.gz +#%{_mandir}/man8/adelsystem_cbi.8.gz +#%{_mandir}/man8/apc_modbus.8.gz %{_mandir}/man8/al175.8.gz %{_mandir}/man8/apcsmart.8.gz @@ -358,13 +359,11 @@ fi %{_mandir}/man8/everups.8.gz %{_mandir}/man8/etapro.8.gz %{_mandir}/man8/gamatronic.8.gz -%{_mandir}/man8/generic_modbus.8.gz +#%{_mandir}/man8/generic_modbus.8.gz %{_mandir}/man8/genericups.8.gz -%if 0%{?fedora} < 39 -%{_mandir}/man8/generic_gpio.8.gz -%endif +#%{_mandir}/man8/generic_gpio.8.gz %{_mandir}/man8/hwmon_ina219.8.gz -%{_mandir}/man8/huawei-ups2000.8.gz +#%{_mandir}/man8/huawei-ups2000.8.gz %{_mandir}/man8/isbmex.8.gz %{_mandir}/man8/ivtscd.8.gz %{_mandir}/man8/liebert.8.gz @@ -385,7 +384,7 @@ fi %{_mandir}/man8/nutdrv_qx.8.gz %{_mandir}/man8/oneac.8.gz %{_mandir}/man8/optiups.8.gz -%{_mandir}/man8/phoenixcontact_modbus.8.gz +#%{_mandir}/man8/phoenixcontact_modbus.8.gz %{_mandir}/man8/pijuice.8.gz %{_mandir}/man8/powercom.8.gz %if %{with powerman} @@ -401,7 +400,7 @@ fi %{_mandir}/man8/snmp-ups.8.gz %{_mandir}/man8/solis.8* %{_mandir}/man8/sockdebug.8.gz -%{_mandir}/man8/socomec_jbus.8.gz +#%{_mandir}/man8/socomec_jbus.8.gz %{_mandir}/man8/tripplite.8.gz %{_mandir}/man8/tripplite_usb.8.gz %{_mandir}/man8/tripplitesu.8.gz @@ -490,302 +489,6 @@ fi %{_libdir}/pkgconfig/libnutscan.pc %changelog -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.8.2.1-5.1.git20240703pr2505 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Wed Jan 29 2025 Michal Hlavinka - 2.8.2.1-4.1.git20240703pr2505 -- fix ftbfs, make it build with unified bin/sbin - -* Fri Jan 17 2025 Fedora Release Engineering - 2.8.2.1-3.1.git20240703pr2505 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Nov 15 2024 Orion Poplawski - 2.8.2.1-2.1.git20240703pr2505 -- Add BR systemd-devel to enable systemd notification support - -* Thu Jul 18 2024 Fedora Release Engineering - 2.8.2.1-1.1.git20240703pr2505 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jul 03 2024 Michal Hlavinka - 2.8.2.1-0.1.git20240703pr2505 -- fix python FTBFS, uses git snapshot as of 20240703 with PR 2505 - -* Fri Jun 07 2024 Python Maint - 2.8.2-2 -- Rebuilt for Python 3.13 - -* Wed Apr 03 2024 Michal Hlavinka - 2.8.2-1 -- updated to 2.8.2(2272586) - -* Thu Jan 25 2024 Fedora Release Engineering - 2.8.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 2.8.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Nov 30 2023 Orion Poplawski - 2.8.1-2 -- Re-add nut.target to nut-client (bz#2156504) - -* Wed Nov 01 2023 Michal Hlavinka - 2.8.1-1 -- updated to 2.8.1 (#2247337) - -* Tue Oct 10 2023 Michal Hlavinka - 2.8.0-14 -- spec cleanup, based on PR#14 by Orion Poplawski - -* Thu Jul 20 2023 Fedora Release Engineering - 2.8.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 2.8.0-12 -- Rebuilt for Python 3.12 - -* Wed Apr 26 2023 Michal Hlavinka - 2.8.0-11 -- update license tag format (SPDX migration) for https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1 - -* Tue Feb 14 2023 Michal Hlavinka - 2.8.0-10 -- add nut-xml to nut recommends (#2151810) - -* Thu Jan 19 2023 Fedora Release Engineering - 2.8.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jan 04 2023 Michal Hlavinka - 2.8.0-8 -- move upslog to nut-client, some small spec file changes (#2156504) - -* Wed Nov 30 2022 Charles R. Anderson - 2.8.0-7 -- use piddir for specifying restart_flag location -- use piddir for specifying configure --with-statepath/pidpath/altpidpath -- add nut-2.8.0-piddir-owner.patch for upstream tmpfiles config creation to not append /nut and always use owner root -- update nut-2.6.3-tmpfiles.patch to use correct tmpfiles config file name -- remove unused downstream tmpfiles source and code - -* Sun Nov 27 2022 Florian Weimer - 2.8.0-6 -- Port configure script to C99 - -* Wed Aug 31 2022 Michal Hlavinka - 2.8.0-5 -- update pid path - -* Fri Jul 22 2022 Fedora Release Engineering - 2.8.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 2.8.0-3 -- Rebuilt for Python 3.11 - -* Tue Jun 07 2022 Michal Hlavinka - 2.8.0-2 -- drop unused solaris init script pulling unnecessary dependency - -* Mon May 09 2022 Michal Hlavinka - 2.8.0-1 -- updated to 2.8.0 - -* Thu Jan 20 2022 Fedora Release Engineering - 2.7.4-44 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Sep 23 2021 Miro Hrončok - 2.7.4-43 -- Don't own /usr/lib/python3.X/site-packages - -* Tue Sep 14 2021 Sahana Prasad - 2.7.4-42 -- Rebuilt with OpenSSL 3.0.0 - -* Thu Jul 22 2021 Fedora Release Engineering - 2.7.4-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jun 08 2021 Michal Hlavinka - 2.7.4-40 -- drop snmp-ups support for DES, as required net-snmp no longer supports it - -* Fri Jun 04 2021 Python Maint - 2.7.4-39 -- Rebuilt for Python 3.10 - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.7.4-38 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 2.7.4-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Sep 15 2020 Jeff Law - 2.7.4-36 -- Force C++14 as this code is not C++17 ready - -* Wed Sep 02 2020 Josef Ridky - 2.7.4-35 -- Resolves: #1865077 - FTBFS in Fedora 33 -- Rebuilt for new release of net-snmp - -* Sat Aug 01 2020 Fedora Release Engineering - 2.7.4-34 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 2.7.4-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jun 02 2020 Michal Hlavinka - 2.7.4-32 -- nut user needs tty group for wall (#1774591) - -* Tue Jun 02 2020 Michal Hlavinka - 2.7.4-31 -- update tmpfiles nut run directory - -* Tue May 26 2020 Orion Poplawski - 2.7.4-30 -- Drop old udev requires/scriptlet - -* Tue May 26 2020 Orion Poplawski - 2.7.4-29 -- Add upstream patch for OpenSSL 1.1.0 support, enable for Fedora >= 33 - -* Tue May 26 2020 Miro Hrončok - 2.7.4-28 -- Rebuilt for Python 3.9 - -* Wed Jan 29 2020 Fedora Release Engineering - 2.7.4-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Oct 04 2019 Michal Hlavinka - 2.7.4-26 -- drop pygtk2 requirements - -* Thu Oct 03 2019 Michal Hlavinka - 2.7.4-25 -- drop python 2 requirements including nut-monitor app - -* Thu Jul 25 2019 Fedora Release Engineering - 2.7.4-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Mar 25 2019 Michal Hlavinka - 2.7.4-23 -- add missing requirements for nut monitor -- fix file descriptor leak for notifycmd - -* Fri Feb 01 2019 Fedora Release Engineering - 2.7.4-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Oct 16 2018 Orion Poplawski - 2.7.4-21 -- Cleanup and modernize spec -- Fix ownership/permissions of /var/run/nut (bug #1584330, #1580082) -- Fix python shbangs - -* Sun Oct 14 2018 Peter Robinson 2.7.4-20 -- Updates dependencies, modernise spec, use %%license -- Python build fixes - -* Tue Jul 24 2018 Adam Williamson - 2.7.4-19 -- Rebuild for new net-snmp - -* Fri Jul 13 2018 Fedora Release Engineering - 2.7.4-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Apr 17 2018 Xavier Bachelot - 2.7.4-17 -- Remove unrecognized configure option --without-hal -- Explicitely disable tcpwrapper support -- Remove unneeded CRLF EOL fix -- Add BR: cppunit-devel - -* Wed Mar 07 2018 Michal Hlavinka - 2.7.4-16 -- add gcc buildrequire - -* Wed Feb 14 2018 Iryna Shcherbina - 2.7.4-15 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Thu Feb 08 2018 Fedora Release Engineering - 2.7.4-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Nov 07 2017 Igor Gnatenko - 2.7.4-13 -- Remove old crufty coreutils requires - -* Wed Aug 30 2017 Michal Hlavinka - 2.7.4-12 -- rebuild for freeipmi update - -* Thu Aug 03 2017 Fedora Release Engineering - 2.7.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 2.7.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jun 22 2017 Michal Hlavinka - 2.7.4-9 -- enable nss crypto (#1463071) - -* Wed May 24 2017 Michal Hlavinka - 2.7.4-8 -- fix location of tmpfiles.d in service files (#1399602) - -* Sat Feb 11 2017 Fedora Release Engineering - 2.7.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 01 2017 Sandro Mani - 2.7.4-6 -- Rebuild (libwebp) - -* Fri Nov 11 2016 Michal Hlavinka - 2.7.4-5 -- use %%_tmpfilesdir macro (#1394009) - -* Thu Sep 15 2016 Till Maas - 2.7.4-4 -- Disable powerman support, powerman was retired on Fedora - -* Thu Aug 11 2016 Michal Hlavinka - 2.7.4-3 -- make sure tmpfiles creation is executped before ups driver (#1365904,#1349362) - -* Tue Jul 19 2016 Fedora Release Engineering - 2.7.4-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Sat Mar 12 2016 Michal Hlavinka - 2.7.4-1 -- nut updated to 2.7.4 - -* Thu Feb 04 2016 Fedora Release Engineering - 2.7.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Dec 05 2015 Kalev Lember - 2.7.3-6 -- Rebuilt for libfreeipmi soname bump - -* Tue Dec 1 2015 Tom Callaway - 2.7.3-5 -- rebuild for libvpx 1.5.0 - -* Wed Jun 17 2015 Fedora Release Engineering - 2.7.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 2.7.3-3 -- Rebuilt for GCC 5 C++11 ABI change - -* Tue Apr 28 2015 Michal Hlavinka - 2.7.3-2 -- start nut driver before the daemon - -* Thu Apr 23 2015 Michal Hlavinka - 2.7.3-1 -- nut updated to 2.7.3 - -* Mon Apr 6 2015 Tom Callaway - 2.7.2-4 -- rebuild against libvpx 1.4.0 - -* Sun Aug 17 2014 Fedora Release Engineering - 2.7.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 2.7.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Apr 22 2014 Michal Hlavinka - 2.7.2-1 -- nut updated to 2.7.2 - -* Thu Apr 17 2014 Michal Hlavinka - 2.7.1-4 -- fix multilib issue (#831429) - -* Thu Mar 06 2014 Michal Hlavinka - 2.7.1-3 -- fix path of nut-driver executable (#1072076) -- fix location of udev rules - -* Thu Mar 06 2014 Michal Hlavinka - 2.7.1-2 -- fix undefined references in libupsclient (#1071919) - -* Thu Feb 27 2014 Michal Hlavinka - 2.7.1-1 -- nut updated to 2.7.1 - -* Tue Sep 24 2013 Michal Hlavinka - 2.6.5-16 -- rebuilt with updated freeipmi (1.3.2) - -* Tue Sep 03 2013 Michal Hlavinka - 2.6.5-15 -- rebuilt with updated freeipmi - -* Sat Aug 03 2013 Fedora Release Engineering - 2.6.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jun 11 2013 Remi Collet - 2.6.5-13 -- rebuild for new GD 2.1.0 - -* Mon Apr 22 2013 Michal Hlavinka - 2.6.5-12 -- do not let upsmon run during update (#916472) -- make binaries hardened (#955157) - -* Thu Feb 28 2013 Michal Hlavinka - 2.6.5-11 -- clean pid file on exit (#916468) - -* Thu Feb 14 2013 Fedora Release Engineering - 2.6.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Jan 21 2013 Adam Tkac - 2.6.5-9 -- rebuild due to "jpeg8-ABI" feature drop - -* Mon Jan 07 2013 Michal Hlavinka - 2.6.5-8 -- do not traceback when ups is not reachable +* Wed Feb 19 2025 Michal Hlavinka - 2.8.2.1-0.1.git20240703pr2505 +- build for epel10, trim changelog From 760ad72a05c80afc4eabe4e4191dde6bf16bb9c3 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 29 Apr 2025 16:46:04 +0200 Subject: [PATCH 02/12] updated to 2.8.3 (#2352734) --- .gitignore | 1 + nut.spec | 18 ++++++++++++++++-- sources | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 56f7b98..cae0d0a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ nut-2.4.3.tar.gz /nut-2.8.1.tar.gz /nut-2.8.2.tar.gz /nut-2.8.2.1.tar.gz +/nut-2.8.3.tar.gz diff --git a/nut.spec b/nut.spec index 2d04cd3..29c2656 100644 --- a/nut.spec +++ b/nut.spec @@ -13,8 +13,8 @@ Summary: Network UPS Tools Name: nut -Version: 2.8.2.1 -Release: 5%{?dist}.1.git20240703pr2505 +Version: 2.8.3 +Release: 1%{?dist} License: GPL-2.0-or-later AND GPL-3.0-or-later Url: https://www.networkupstools.org/ Source: https://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz @@ -318,12 +318,18 @@ fi %{_unitdir}/nut-driver.target %{_unitdir}/nut-server.service %{_unitdir}/nut.target +%{_presetdir}/nut-systemd.preset +%{_unitdir}/enphase-monitor@.service +%{_unitdir}/nut-logger.service +%{_unitdir}/nut-udev-settle.service %{_sbindir}/upsd %{_bindir}/nutconf %{_bindir}/nut-scanner %{_libdir}/libnutscan.so.* +%{_libdir}/libnutconf.so.* %{_libexecdir}/nut-driver-enumerator.sh %{_libexecdir}/sockdebug +%{_libexecdir}/enphase-monitor %{_datadir}/augeas/lenses/dist/nut* %{_datadir}/augeas/lenses/dist/tests/test_nut.aug %{_datadir}/%{name}/cmdvartab @@ -354,6 +360,7 @@ fi %{_mandir}/man8/blazer_ser.8.gz %{_mandir}/man8/blazer_usb.8.gz %{_mandir}/man8/clone.8.gz +%{_mandir}/man8/clone-outlet.8.gz %{_mandir}/man8/dummy-ups.8.gz %{_mandir}/man8/everups.8.gz %{_mandir}/man8/etapro.8.gz @@ -369,12 +376,14 @@ fi %{_mandir}/man8/ivtscd.8.gz %{_mandir}/man8/liebert.8.gz %{_mandir}/man8/liebert-esp2.8.gz +%{_mandir}/man8/liebert-gxe.8.gz %{_mandir}/man8/masterguard.8.gz %{_mandir}/man8/metasys.8.gz %{_mandir}/man8/microdowell.8.gz %{_mandir}/man8/microsol-apc.8.gz %{_mandir}/man8/mge-utalk.8.gz %{_mandir}/man8/mge-shut.8.gz +%{_mandir}/man8/nhs_ser.8.gz %{_mandir}/man8/nutupsdrv.8.gz %{_mandir}/man8/nutdrv_atcl_usb.8.gz %{_mandir}/man8/nutdrv_siemens_sitop.8.gz @@ -483,13 +492,18 @@ fi %{_libdir}/libupsclient.so %{_libdir}/libnutclient.so %{_libdir}/libnutclientstub.so +%{_libdir}/libnutconf.so %{_libdir}/libnutscan.so %{_libdir}/pkgconfig/libupsclient.pc %{_libdir}/pkgconfig/libnutclient.pc +%{_libdir}/pkgconfig/libnutconf.pc %{_libdir}/pkgconfig/libnutclientstub.pc %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Tue Apr 29 2025 Michal Hlavinka - 2.8.3-1 +- updated to 2.8.3 (#2352734) + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.8.2.1-5.1.git20240703pr2505 - Add sysusers.d config file to allow rpm to create users/groups automatically diff --git a/sources b/sources index 379e679..f63aad6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nut-2.8.2.1.tar.gz) = 62457781758be939919d1c9bbed4b2895d2c434c73ec6d36ab6120898f84a24131cf7796d320117c5f8780e63da1aa6966e59156466ff78f20267b0a4eed1652 +SHA512 (nut-2.8.3.tar.gz) = 0aeafad02ab323b02041a370c586dede91483cab57e0a9d1256a685716ca9f0d0f114df904ef472d48fa53ac1896690b7878828eb3b00934959c7aeaa63af99f From 9867e182417607deb337c2112a8f1c45f4e33179 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 29 Apr 2025 17:37:37 +0200 Subject: [PATCH 03/12] add needed buildrequire jq --- nut.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nut.spec b/nut.spec index 29c2656..2945107 100644 --- a/nut.spec +++ b/nut.spec @@ -47,6 +47,7 @@ BuildRequires: freetype-devel BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gd-devel +BuildRequires: jq %if 0%{?fedora} < 39 BuildRequires: libgpiod-devel %endif From bf5c2534c310cc1c2cd40acb80a7a5abee0e2927 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 30 Apr 2025 11:03:22 +0200 Subject: [PATCH 04/12] build for epel10, trim changelog --- .gitignore | 1 + nut.spec | 16 ++++++++++++++-- sources | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 56f7b98..cae0d0a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ nut-2.4.3.tar.gz /nut-2.8.1.tar.gz /nut-2.8.2.tar.gz /nut-2.8.2.1.tar.gz +/nut-2.8.3.tar.gz diff --git a/nut.spec b/nut.spec index 71e0d60..cb80d30 100644 --- a/nut.spec +++ b/nut.spec @@ -13,8 +13,8 @@ Summary: Network UPS Tools Name: nut -Version: 2.8.2.1 -Release: 0%{?dist}.1.git20240703pr2505 +Version: 2.8.3 +Release: 1%{?dist} License: GPL-2.0-or-later AND GPL-3.0-or-later Url: https://www.networkupstools.org/ Source: https://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz @@ -47,6 +47,7 @@ BuildRequires: freetype-devel BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gd-devel +BuildRequires: jq # not available in epel atm #BuildRequires: libgpiod-devel #BuildRequires: libmodbus-devel @@ -319,12 +320,18 @@ fi %{_unitdir}/nut-driver.target %{_unitdir}/nut-server.service %{_unitdir}/nut.target +%{_presetdir}/nut-systemd.preset +%{_unitdir}/enphase-monitor@.service +%{_unitdir}/nut-logger.service +%{_unitdir}/nut-udev-settle.service %{_sbindir}/upsd %{_bindir}/nutconf %{_bindir}/nut-scanner %{_libdir}/libnutscan.so.* +%{_libdir}/libnutconf.so.* %{_libexecdir}/nut-driver-enumerator.sh %{_libexecdir}/sockdebug +%{_libexecdir}/enphase-monitor %{_datadir}/augeas/lenses/dist/nut* %{_datadir}/augeas/lenses/dist/tests/test_nut.aug %{_datadir}/%{name}/cmdvartab @@ -355,6 +362,7 @@ fi %{_mandir}/man8/blazer_ser.8.gz %{_mandir}/man8/blazer_usb.8.gz %{_mandir}/man8/clone.8.gz +%{_mandir}/man8/clone-outlet.8.gz %{_mandir}/man8/dummy-ups.8.gz %{_mandir}/man8/everups.8.gz %{_mandir}/man8/etapro.8.gz @@ -368,12 +376,14 @@ fi %{_mandir}/man8/ivtscd.8.gz %{_mandir}/man8/liebert.8.gz %{_mandir}/man8/liebert-esp2.8.gz +%{_mandir}/man8/liebert-gxe.8.gz %{_mandir}/man8/masterguard.8.gz %{_mandir}/man8/metasys.8.gz %{_mandir}/man8/microdowell.8.gz %{_mandir}/man8/microsol-apc.8.gz %{_mandir}/man8/mge-utalk.8.gz %{_mandir}/man8/mge-shut.8.gz +%{_mandir}/man8/nhs_ser.8.gz %{_mandir}/man8/nutupsdrv.8.gz %{_mandir}/man8/nutdrv_atcl_usb.8.gz %{_mandir}/man8/nutdrv_siemens_sitop.8.gz @@ -482,9 +492,11 @@ fi %{_libdir}/libupsclient.so %{_libdir}/libnutclient.so %{_libdir}/libnutclientstub.so +%{_libdir}/libnutconf.so %{_libdir}/libnutscan.so %{_libdir}/pkgconfig/libupsclient.pc %{_libdir}/pkgconfig/libnutclient.pc +%{_libdir}/pkgconfig/libnutconf.pc %{_libdir}/pkgconfig/libnutclientstub.pc %{_libdir}/pkgconfig/libnutscan.pc diff --git a/sources b/sources index 379e679..f63aad6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nut-2.8.2.1.tar.gz) = 62457781758be939919d1c9bbed4b2895d2c434c73ec6d36ab6120898f84a24131cf7796d320117c5f8780e63da1aa6966e59156466ff78f20267b0a4eed1652 +SHA512 (nut-2.8.3.tar.gz) = 0aeafad02ab323b02041a370c586dede91483cab57e0a9d1256a685716ca9f0d0f114df904ef472d48fa53ac1896690b7878828eb3b00934959c7aeaa63af99f From 1f502ae93a12806f866df25d2c9860b1b790a656 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 21 May 2025 13:43:14 +0200 Subject: [PATCH 05/12] rename rhino to nutdrv_rhino to prevent file conflict (rhbz#2367057) --- nut-2.8.3-rhinoname.patch | 23 +++++++++++++++++++++++ nut.spec | 12 ++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 nut-2.8.3-rhinoname.patch diff --git a/nut-2.8.3-rhinoname.patch b/nut-2.8.3-rhinoname.patch new file mode 100644 index 0000000..5e978c0 --- /dev/null +++ b/nut-2.8.3-rhinoname.patch @@ -0,0 +1,23 @@ +diff -up nut-2.8.3-build/nut-2.8.3/drivers/Makefile.am.rhinoname nut-2.8.3-build/nut-2.8.3/drivers/Makefile.am +--- nut-2.8.3-build/nut-2.8.3/drivers/Makefile.am.rhinoname 2025-05-21 13:16:02.566975097 +0200 ++++ nut-2.8.3-build/nut-2.8.3/drivers/Makefile.am 2025-05-21 13:17:07.563528645 +0200 +@@ -62,7 +62,7 @@ NUTSW_DRIVERLIST = $(NUTSW_DRIVERLIST_DU + SERIAL_DRIVERLIST = al175 bcmxcp belkin belkinunv bestfcom \ + bestfortress bestuferrups bestups etapro everups \ + gamatronic genericups isbmex liebert liebert-esp2 liebert-gxe masterguard metasys \ +- mge-utalk microdowell microsol-apc mge-shut oneac optiups powercom rhino \ ++ mge-utalk microdowell microsol-apc mge-shut oneac optiups powercom nutdrv_rhino \ + safenet nutdrv_siemens-sitop solis tripplite tripplitesu upscode2 victronups powerpanel \ + blazer_ser ivtscd apcsmart apcsmart-old riello_ser sms_ser bicker_ser + if HAVE_LINUX_SERIAL_H +@@ -182,8 +182,8 @@ powercom_SOURCES = powercom.c + powercom_LDADD = $(LDADD) -lm + powerpanel_SOURCES = powerpanel.c powerp-bin.c powerp-txt.c + powerpanel_LDADD = $(LDADD) -lm +-rhino_SOURCES = rhino.c +-rhino_LDADD = $(LDADD) -lm ++nutdrv_rhino_SOURCES = rhino.c ++nutdrv_rhino_LDADD = $(LDADD) -lm + safenet_SOURCES = safenet.c + nutdrv_siemens_sitop_SOURCES = nutdrv_siemens_sitop.c + solis_SOURCES = solis.c diff --git a/nut.spec b/nut.spec index 2945107..4e922f8 100644 --- a/nut.spec +++ b/nut.spec @@ -14,7 +14,7 @@ Summary: Network UPS Tools Name: nut Version: 2.8.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later AND GPL-3.0-or-later Url: https://www.networkupstools.org/ Source: https://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz @@ -24,6 +24,7 @@ Patch2: nut-2.8.0-piddir-owner.patch #quick fix. TODO: fix it properly Patch9: nut-2.6.5-rmpidf.patch Patch15: nut-c99-strdup.patch +Patch16: nut-2.8.3-rhinoname.patch Requires(post): coreutils systemd Requires(preun): systemd @@ -133,6 +134,7 @@ necessary to develop NUT client applications. %patch -P 2 -p1 -b .piddir-owner %patch -P 9 -p1 -b .rmpidf %patch -P 15 -p1 +%patch -P 16 -p2 -b .rhinoname sed -i 's|=NUT-Monitor|=nut-monitor|' scripts/python/app/nut-monitor-py3qt5.desktop sed -i "s|sys.argv\[0\]|'%{_datadir}/%{name}/nut-monitor/nut-monitor'|" scripts/python/app/NUT-Monitor-py3qt5.in @@ -241,6 +243,9 @@ do mv -f $fe.new $fe done +# rename rhino to nutdrv_rhino to prevent file conflict (rhbz#2367057) +mv %{buildroot}%{_mandir}/man8/rhino.8 %{buildroot}%{_mandir}/man8/nutdrv_rhino.8 + # install PyNUT install -p -D -m 644 scripts/python/module/PyNUT.py %{buildroot}%{python3_sitelib}/PyNUT.py # install nut-monitor @@ -402,7 +407,7 @@ fi %{_mandir}/man8/powerman-pdu.8.gz %endif %{_mandir}/man8/powerpanel.8.gz -%{_mandir}/man8/rhino.8.gz +%{_mandir}/man8/nutdrv_rhino.8.gz %{_mandir}/man8/richcomm_usb.8.gz %{_mandir}/man8/riello_ser.8.gz %{_mandir}/man8/riello_usb.8.gz @@ -502,6 +507,9 @@ fi %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Wed May 21 2025 Michal Hlavinka - 2.8.3-2 +- rename rhino to nutdrv_rhino to prevent file conflict (rhbz#2367057) + * Tue Apr 29 2025 Michal Hlavinka - 2.8.3-1 - updated to 2.8.3 (#2352734) From 38f34fb51d56b22b5711bdaa510da1f5bdbbbd05 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 19:58:22 +0200 Subject: [PATCH 06/12] Rebuilt for Python 3.14 --- nut.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nut.spec b/nut.spec index 4e922f8..84cb6e9 100644 --- a/nut.spec +++ b/nut.spec @@ -14,7 +14,7 @@ Summary: Network UPS Tools Name: nut Version: 2.8.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later AND GPL-3.0-or-later Url: https://www.networkupstools.org/ Source: https://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz @@ -507,6 +507,9 @@ fi %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Mon Jun 02 2025 Python Maint - 2.8.3-3 +- Rebuilt for Python 3.14 + * Wed May 21 2025 Michal Hlavinka - 2.8.3-2 - rename rhino to nutdrv_rhino to prevent file conflict (rhbz#2367057) From cc9daebf1e3d7a6ebe0e4fd8c62cae1ebb88761a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:02:13 +0000 Subject: [PATCH 07/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- nut.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nut.spec b/nut.spec index 84cb6e9..f2d0381 100644 --- a/nut.spec +++ b/nut.spec @@ -14,7 +14,7 @@ Summary: Network UPS Tools Name: nut Version: 2.8.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later AND GPL-3.0-or-later Url: https://www.networkupstools.org/ Source: https://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz @@ -507,6 +507,9 @@ fi %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.8.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Python Maint - 2.8.3-3 - Rebuilt for Python 3.14 From 4870df85c6f447c4a0956d8728ecee5c9101901b Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Thu, 14 Aug 2025 12:13:59 +0200 Subject: [PATCH 08/12] updated to 2.8.4 (#2387244) --- .gitignore | 1 + nut-2.8.3-rhinoname.patch | 20 ++++++++++---------- nut.spec | 23 +++++++++++++++++------ sources | 2 +- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index cae0d0a..a737052 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ nut-2.4.3.tar.gz /nut-2.8.2.tar.gz /nut-2.8.2.1.tar.gz /nut-2.8.3.tar.gz +/nut-2.8.4.tar.gz diff --git a/nut-2.8.3-rhinoname.patch b/nut-2.8.3-rhinoname.patch index 5e978c0..71be46d 100644 --- a/nut-2.8.3-rhinoname.patch +++ b/nut-2.8.3-rhinoname.patch @@ -1,19 +1,19 @@ -diff -up nut-2.8.3-build/nut-2.8.3/drivers/Makefile.am.rhinoname nut-2.8.3-build/nut-2.8.3/drivers/Makefile.am ---- nut-2.8.3-build/nut-2.8.3/drivers/Makefile.am.rhinoname 2025-05-21 13:16:02.566975097 +0200 -+++ nut-2.8.3-build/nut-2.8.3/drivers/Makefile.am 2025-05-21 13:17:07.563528645 +0200 -@@ -62,7 +62,7 @@ NUTSW_DRIVERLIST = $(NUTSW_DRIVERLIST_DU +diff -up nut-2.8.4-build/nut-2.8.4/drivers/Makefile.am.rhinoname nut-2.8.4-build/nut-2.8.4/drivers/Makefile.am +--- nut-2.8.4-build/nut-2.8.4/drivers/Makefile.am.rhinoname 2025-08-14 11:08:48.763700333 +0200 ++++ nut-2.8.4-build/nut-2.8.4/drivers/Makefile.am 2025-08-14 11:29:43.803846801 +0200 +@@ -74,7 +74,7 @@ NUTSW_DRIVERLIST = $(NUTSW_DRIVERLIST_DU SERIAL_DRIVERLIST = al175 bcmxcp belkin belkinunv bestfcom \ bestfortress bestuferrups bestups etapro everups \ gamatronic genericups isbmex liebert liebert-esp2 liebert-gxe masterguard metasys \ -- mge-utalk microdowell microsol-apc mge-shut oneac optiups powercom rhino \ -+ mge-utalk microdowell microsol-apc mge-shut oneac optiups powercom nutdrv_rhino \ +- mge-utalk microdowell microsol-apc mge-shut nutdrv_hashx oneac optiups powercom powervar_cx_ser rhino \ ++ mge-utalk microdowell microsol-apc mge-shut nutdrv_hashx oneac optiups powercom powervar_cx_ser nutdrv_rhino \ safenet nutdrv_siemens-sitop solis tripplite tripplitesu upscode2 victronups powerpanel \ - blazer_ser ivtscd apcsmart apcsmart-old riello_ser sms_ser bicker_ser + blazer_ser ivtscd apcsmart apcsmart-old riello_ser sms_ser bicker_ser ve-direct if HAVE_LINUX_SERIAL_H -@@ -182,8 +182,8 @@ powercom_SOURCES = powercom.c - powercom_LDADD = $(LDADD) -lm - powerpanel_SOURCES = powerpanel.c powerp-bin.c powerp-txt.c +@@ -198,8 +198,8 @@ powerpanel_SOURCES = powerpanel.c powerp powerpanel_LDADD = $(LDADD) -lm + powervar_cx_ser_SOURCES = powervar_cx_ser.c powervar_cx.c + powervar_cx_ser_CFLAGS = $(AM_CFLAGS) -DPVAR_SERIAL=1 -rhino_SOURCES = rhino.c -rhino_LDADD = $(LDADD) -lm +nutdrv_rhino_SOURCES = rhino.c diff --git a/nut.spec b/nut.spec index f2d0381..f88dc36 100644 --- a/nut.spec +++ b/nut.spec @@ -13,8 +13,8 @@ Summary: Network UPS Tools Name: nut -Version: 2.8.3 -Release: 4%{?dist} +Version: 2.8.4 +Release: 1%{?dist} License: GPL-2.0-or-later AND GPL-3.0-or-later Url: https://www.networkupstools.org/ Source: https://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz @@ -33,6 +33,7 @@ Recommends: nut-xml Requires: group(dialout) Requires: group(tty) +BuildRequires: asciidoc BuildRequires: make BuildRequires: autoconf BuildRequires: automake @@ -131,9 +132,9 @@ necessary to develop NUT client applications. %prep %setup -q -%patch -P 2 -p1 -b .piddir-owner +#patch -P 2 -p1 -b .piddir-owner %patch -P 9 -p1 -b .rmpidf -%patch -P 15 -p1 +#patch -P 15 -p1 %patch -P 16 -p2 -b .rhinoname sed -i 's|=NUT-Monitor|=nut-monitor|' scripts/python/app/nut-monitor-py3qt5.desktop @@ -194,7 +195,8 @@ export LDFLAGS="-Wl,-z,now" --with-pkgconfig-dir=%{_libdir}/pkgconfig \ --disable-static \ --with-udev-dir=%{_usr}/lib/udev \ - --libdir=%{_libdir} + --libdir=%{_libdir} \ + --enable-docs-changelog=no # --with-doc # does not work in 2.7.1 # for rhbz#838139 check if still needed? @@ -370,6 +372,7 @@ fi %{_mandir}/man8/dummy-ups.8.gz %{_mandir}/man8/everups.8.gz %{_mandir}/man8/etapro.8.gz +%{_mandir}/man8/failover.8.gz %{_mandir}/man8/gamatronic.8.gz %{_mandir}/man8/generic_modbus.8.gz %{_mandir}/man8/genericups.8.gz @@ -392,6 +395,7 @@ fi %{_mandir}/man8/nhs_ser.8.gz %{_mandir}/man8/nutupsdrv.8.gz %{_mandir}/man8/nutdrv_atcl_usb.8.gz +%{_mandir}/man8/nutdrv_hashx.8.gz %{_mandir}/man8/nutdrv_siemens_sitop.8.gz %{_mandir}/man8/nut-driver-enumerator.8.gz %{_mandir}/man8/nut-ipmipsu.8.gz @@ -407,6 +411,8 @@ fi %{_mandir}/man8/powerman-pdu.8.gz %endif %{_mandir}/man8/powerpanel.8.gz +%{_mandir}/man8/powervar_cx_ser.8.gz +%{_mandir}/man8/powervar_cx_usb.8.gz %{_mandir}/man8/nutdrv_rhino.8.gz %{_mandir}/man8/richcomm_usb.8.gz %{_mandir}/man8/riello_ser.8.gz @@ -420,12 +426,13 @@ fi %{_mandir}/man8/tripplite.8.gz %{_mandir}/man8/tripplite_usb.8.gz %{_mandir}/man8/tripplitesu.8.gz -%{_mandir}/man8/victronups.8.gz %{_mandir}/man8/upscode2.8* %{_mandir}/man8/upsd.8.gz %{_mandir}/man8/upsdrvctl.8.gz %{_mandir}/man8/upsdrvsvcctl.8.gz %{_mandir}/man8/usbhid-ups.8.gz +%{_mandir}/man8/victronups.8.gz +%{_mandir}/man8/ve-direct.8.gz %{_sysusersdir}/nut.conf %files client @@ -456,6 +463,7 @@ fi %{_mandir}/man5/nut.conf.5.gz %{_mandir}/man5/upsmon.conf.5.gz %{_mandir}/man5/upssched.conf.5.gz +%{_mandir}/man7/nut.7.gz %{_mandir}/man8/upsc.8.gz %{_mandir}/man8/upscmd.8.gz %{_mandir}/man8/upslog.8.gz @@ -507,6 +515,9 @@ fi %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Thu Aug 14 2025 Michal Hlavinka - 2.8.4-1 +- updated to 2.8.4 (#2387244) + * Thu Jul 24 2025 Fedora Release Engineering - 2.8.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index f63aad6..5f00a02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nut-2.8.3.tar.gz) = 0aeafad02ab323b02041a370c586dede91483cab57e0a9d1256a685716ca9f0d0f114df904ef472d48fa53ac1896690b7878828eb3b00934959c7aeaa63af99f +SHA512 (nut-2.8.4.tar.gz) = 0d87c0006608f92ae54f8a500f93d9a81eac1d9abf57f32e7718dd72f265b8293a0b6cdba04c802b81eaf8907b52669c36b47b6875a4377f9752845ac6c5e8fa From 7164fc2d6d1759622c72b07eda35a07e217864af Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 13:02:57 +0200 Subject: [PATCH 09/12] Rebuilt for Python 3.14.0rc2 bytecode --- nut.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nut.spec b/nut.spec index f88dc36..ff9aa07 100644 --- a/nut.spec +++ b/nut.spec @@ -14,7 +14,7 @@ Summary: Network UPS Tools Name: nut Version: 2.8.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later AND GPL-3.0-or-later Url: https://www.networkupstools.org/ Source: https://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz @@ -515,6 +515,9 @@ fi %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Fri Aug 15 2025 Python Maint - 2.8.4-2 +- Rebuilt for Python 3.14.0rc2 bytecode + * Thu Aug 14 2025 Michal Hlavinka - 2.8.4-1 - updated to 2.8.4 (#2387244) From 069b76a3a8ee7a2e188b0e8e936758f7b811f8dc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:33:37 +0200 Subject: [PATCH 10/12] Rebuilt for Python 3.14.0rc3 bytecode --- nut.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nut.spec b/nut.spec index ff9aa07..40f63d1 100644 --- a/nut.spec +++ b/nut.spec @@ -14,7 +14,7 @@ Summary: Network UPS Tools Name: nut Version: 2.8.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later AND GPL-3.0-or-later Url: https://www.networkupstools.org/ Source: https://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz @@ -515,6 +515,9 @@ fi %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Fri Sep 19 2025 Python Maint - 2.8.4-3 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 2.8.4-2 - Rebuilt for Python 3.14.0rc2 bytecode From 77706a32be789aa4285c7626aa024b30fd7fd414 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 30 Sep 2025 12:11:02 +0200 Subject: [PATCH 11/12] based on PR#18 by Orion Poplawski Build NUT-Monitor and ship in separate nut-monitor package (rhbz#2359149) Move UPS drivers into /usr/libexec/nut --- nut.spec | 80 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 30 deletions(-) diff --git a/nut.spec b/nut.spec index 40f63d1..aecfb12 100644 --- a/nut.spec +++ b/nut.spec @@ -1,5 +1,4 @@ %global _hardened_build 1 -%bcond_with python2 #TODO: split nut-client so it does not require python %global nut_uid 57 @@ -7,14 +6,14 @@ %global cgidir /var/www/nut-cgi-bin %global piddir /run/nut -%global modeldir %{_sbindir} +%global modeldir %{_libexecdir}/%{name} # powerman is retired on Fedora, therefore disable it by default %bcond_with powerman Summary: Network UPS Tools Name: nut Version: 2.8.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later AND GPL-3.0-or-later Url: https://www.networkupstools.org/ Source: https://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz @@ -94,10 +93,6 @@ live status tracking on web pages, and more. Summary: Network UPS Tools client monitoring utilities Requires(post): systemd Requires(preun): systemd -%if %{with python2} -Requires: pygtk2, pygtk2-libglade -#only for python and gui part -%endif Requires: group(dialout) Requires: group(tty) @@ -114,6 +109,14 @@ Requires: %{name}-client = %{version}-%{release} webserver This package includes CGI programs for accessing UPS status via a web browser. +%package monitor +Summary: Network UPS Tools monitor application +BuildRequires: python3-pyqt6 + +%description monitor +This package contain the Python NUT-Monitor GUI application to +monitor a UPS. + %package xml Summary: XML UPS driver for the Network UPS Tools Requires: %{name}-client = %{version}-%{release} @@ -137,8 +140,6 @@ necessary to develop NUT client applications. #patch -P 15 -p1 %patch -P 16 -p2 -b .rhinoname -sed -i 's|=NUT-Monitor|=nut-monitor|' scripts/python/app/nut-monitor-py3qt5.desktop -sed -i "s|sys.argv\[0\]|'%{_datadir}/%{name}/nut-monitor/nut-monitor'|" scripts/python/app/NUT-Monitor-py3qt5.in sed -i 's|LIBSSL_LDFLAGS|LIBSSL_LIBS|' lib/libupsclient-config.in sed -i 's|LIBSSL_LDFLAGS|LIBSSL_LIBS|' lib/libupsclient.pc.in @@ -156,7 +157,7 @@ m nut tty EOF %build -%if 0%{?fedora} > 38 +%if 0%{?fedora} #--without-gpio is not enough to stop it complaining about missing library sed -i 's|with_gpio="[^"]*"|with_gpio="no"|g' configure.ac %endif @@ -170,7 +171,7 @@ export LDFLAGS="-Wl,-z,now" --without-powerman \ %endif --with-libltdl \ -%if (0%{?fedora} && 0%{?fedora} < 33) || 0%{?el8} +%if 0%{?el8} --with-nss \ %endif --without-wrap \ @@ -187,7 +188,7 @@ export LDFLAGS="-Wl,-z,now" --sysconfdir=%{_sysconfdir}/ups \ --with-cgipath=%{cgidir} \ --with-drvpath=%{modeldir} \ -%if 0%{?fedora} > 38 +%if 0%{?fedora} --without-gpio \ %endif --with-systemdsystemunitdir=%{_unitdir} \ @@ -250,16 +251,20 @@ mv %{buildroot}%{_mandir}/man8/rhino.8 %{buildroot}%{_mandir}/man8/nutdrv_rhino. # install PyNUT install -p -D -m 644 scripts/python/module/PyNUT.py %{buildroot}%{python3_sitelib}/PyNUT.py -# install nut-monitor -%if %{with python2} -mkdir -p %{buildroot}%{_datadir}/nut/nut-monitor/pixmaps -install -p -m 755 scripts/python/app/NUT-Monitor %{buildroot}%{_datadir}/nut/nut-monitor/nut-monitor -install -p -m 644 scripts/python/app/gui-1.3.glade %{buildroot}%{_datadir}/nut/nut-monitor -install -p -m 644 scripts/python/app/pixmaps/* %{buildroot}%{_datadir}/nut/nut-monitor/pixmaps/ -install -p -D scripts/python/app/nut-monitor.png %{buildroot}%{_datadir}/pixmaps/nut-monitor.png -desktop-file-install --dir=%{buildroot}%{_datadir}/applications scripts/python/app/nut-monitor.desktop -ln -s %{_datadir}/nut/nut-monitor/nut-monitor %{buildroot}%{_bindir}/nut-monitor -%endif +# add lowercase name +ln %{buildroot}%{_bindir}/{NUT-Monitor,nut-monitor} +# install desktop file +mkdir -p %{buildroot}%{_datadir}/applications +desktop-file-install \ + --dir=%{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/nut-monitor/app/nut-monitor.desktop +# install icons +for res in 256x256 48x48 64x64 scalable +do + mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${res}/apps + ln %{buildroot}%{_datadir}/nut-monitor/app/icons/${res}/nut-monitor.* \ + %{buildroot}%{_datadir}/icons/hicolor/${res}/apps/ +done # Setup permissions for pid file touch %{buildroot}/%{piddir}/upsmon.pid @@ -315,7 +320,9 @@ fi %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users %attr(644,root,root) %{_usr}/lib/udev/rules.d/62-nut-usbups.rules %attr(644,root,root) %{_usr}/lib/udev/rules.d/62-nut-ipmipsu.rules -%{modeldir}/* +%{modeldir}/ +# dummy-ups requires libupsclient +%exclude %{modeldir}/dummy-ups %exclude %{modeldir}/netxml-ups %{_unitdir}/nut-driver-enumerator.path %{_unitdir}/nut-driver-enumerator.service @@ -333,6 +340,8 @@ fi %{_sbindir}/upsd %{_bindir}/nutconf %{_bindir}/nut-scanner +%{_sbindir}/upsdrvctl +%{_sbindir}/upsdrvsvcctl %{_libdir}/libnutscan.so.* %{_libdir}/libnutconf.so.* %{_libexecdir}/nut-driver-enumerator.sh @@ -453,6 +462,8 @@ fi %{_sbindir}/upsmon %{_sbindir}/upssched %{_bindir}/upssched-cmd +# dummy-ups requires libupsclient +%{modeldir}/dummy-ups %{_unitdir}/nut-monitor.service # nut-monitor.service also needs nut.target %{_unitdir}/nut.target @@ -470,15 +481,19 @@ fi %{_mandir}/man8/upsrw.8.gz %{_mandir}/man8/upsmon.8.gz %{_mandir}/man8/upssched.8.gz +%{_datadir}/nut +%{_sysusersdir}/nut.conf + +%files monitor +%{_bindir}/nut-monitor +%{_bindir}/NUT-Monitor +%{_datadir}/applications/nut-monitor.desktop +%{_datadir}/icons/hicolor/*/apps/nut-monitor.png +%{_datadir}/icons/hicolor/scalable/apps/nut-monitor.svg +%{_datadir}/nut-monitor/ +%{_mandir}/man8/NUT-Monitor*.8.gz %pycached %{python3_sitelib}/PyNUT.py %pycached %{python3_sitelib}/test_nutclient.py -%{_datadir}/nut -%if %{with python2} -%{_bindir}/nut-monitor -%{_datadir}/pixmaps/nut-monitor.png -%{_datadir}/applications/nut-monitor.desktop -%endif -%{_sysusersdir}/nut.conf %files cgi %config(noreplace) %attr(644,root,root) %{_sysconfdir}/ups/hosts.conf @@ -515,6 +530,11 @@ fi %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Tue Sep 30 2025 Michal Hlavinka - 2.8.4-4 +- based on PR#18 by Orion Poplawski +- Build NUT-Monitor and ship in separate nut-monitor package (rhbz#2359149) +- Move UPS drivers into /usr/libexec/nut + * Fri Sep 19 2025 Python Maint - 2.8.4-3 - Rebuilt for Python 3.14.0rc3 bytecode From 98284f631bc0248fc780cc86b979cf8470d4d83c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 5 Dec 2025 18:34:11 -0700 Subject: [PATCH 12/12] Add missing || : to preinstall scriptlet (rhbz#241964) --- nut.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nut.spec b/nut.spec index aecfb12..dba51af 100644 --- a/nut.spec +++ b/nut.spec @@ -13,7 +13,7 @@ Summary: Network UPS Tools Name: nut Version: 2.8.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later AND GPL-3.0-or-later Url: https://www.networkupstools.org/ Source: https://www.networkupstools.org/source/2.8/%{name}-%{version}.tar.gz @@ -277,8 +277,8 @@ install -m0644 -D nut.sysusers.conf %{buildroot}%{_sysusersdir}/nut.conf # phase 1: stop upsmon before upsd changes if [ "$1" = "2" ]; then rm -f %restart_flag - /bin/systemctl is-active nut-monitor.service >/dev/null 2>&1 && touch %restart_flag ||: - /bin/systemctl stop nut-monitor.service >/dev/null 2>&1 + /bin/systemctl is-active nut-monitor.service >/dev/null 2>&1 && touch %restart_flag || : + /bin/systemctl stop nut-monitor.service >/dev/null 2>&1 || : fi @@ -530,6 +530,9 @@ fi %{_libdir}/pkgconfig/libnutscan.pc %changelog +* Sat Dec 06 2025 Orion Poplawski - 2.8.4-5 +- Add missing || : to preinstall scriptlet (rhbz#2419644) + * Tue Sep 30 2025 Michal Hlavinka - 2.8.4-4 - based on PR#18 by Orion Poplawski - Build NUT-Monitor and ship in separate nut-monitor package (rhbz#2359149)