From 685ccdf47b6d481643312a7e36f7782012f04ddb Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:44:15 +0100 Subject: [PATCH] fix for duplicate tmpfilesdir conf provided [release 2.8.1-2mamba;Mon Dec 04 2023] --- nut.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/nut.spec b/nut.spec index f2f68a5..9e34298 100644 --- a/nut.spec +++ b/nut.spec @@ -1,6 +1,6 @@ Name: nut Version: 2.8.1 -Release: 1mamba +Release: 2mamba Summary: A collection of network UPS tools Group: System/Kernel and Hardware Vendor: openmamba @@ -59,7 +59,6 @@ Requires: pkg-config %description -n lib%{name}-devel This package contains libraries and header files for developing applications that use %{name}. - %debug_package %prep @@ -101,10 +100,8 @@ This package contains libraries and header files for developing applications tha find %{buildroot}%{_sysconfdir}/nut -name *.sample -exec rename '.sample' '' {} \; install -D -m0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/nut.conf -install -D -m0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/nut.conf - -#rm -f %{buildroot}%{_datadir}/nut/solaris-init/nut -#rmdir %{buildroot}%{_datadir}/nut/solaris-init +#install -D -m0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/nut.conf +mv %{buildroot}%{_tmpfilesdir}/nut{-common-tmpfiles,}.conf %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -145,7 +142,6 @@ install -D -m0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/nut.conf %{_systemd_util_dir}/system-shutdown/nutshutdown %{_sysusersdir}/nut.conf %{_tmpfilesdir}/nut.conf -%{_tmpfilesdir}/nut-common-tmpfiles.conf %{python27_sitearch}/PyNUT.py %{python27_sitearch}/test_nutclient.py %{python3_sitearch}/PyNUT.py @@ -185,6 +181,9 @@ install -D -m0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/nut.conf %doc NEWS README %changelog +* Mon Dec 04 2023 Silvan Calarco 2.8.1-2mamba +- fix for duplicate tmpfilesdir conf provided + * Wed Nov 08 2023 Automatic Build System 2.8.1-1mamba - automatic version update by autodist