fix for duplicate tmpfilesdir conf provided [release 2.8.1-2mamba;Mon Dec 04 2023]

This commit is contained in:
Silvan Calarco 2024-01-06 07:44:15 +01:00
parent 54e0b8f02b
commit 685ccdf47b

View File

@ -1,6 +1,6 @@
Name: nut Name: nut
Version: 2.8.1 Version: 2.8.1
Release: 1mamba Release: 2mamba
Summary: A collection of network UPS tools Summary: A collection of network UPS tools
Group: System/Kernel and Hardware Group: System/Kernel and Hardware
Vendor: openmamba Vendor: openmamba
@ -59,7 +59,6 @@ Requires: pkg-config
%description -n lib%{name}-devel %description -n lib%{name}-devel
This package contains libraries and header files for developing applications that use %{name}. This package contains libraries and header files for developing applications that use %{name}.
%debug_package %debug_package
%prep %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' '' {} \; find %{buildroot}%{_sysconfdir}/nut -name *.sample -exec rename '.sample' '' {} \;
install -D -m0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/nut.conf install -D -m0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/nut.conf
install -D -m0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/nut.conf #install -D -m0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/nut.conf
mv %{buildroot}%{_tmpfilesdir}/nut{-common-tmpfiles,}.conf
#rm -f %{buildroot}%{_datadir}/nut/solaris-init/nut
#rmdir %{buildroot}%{_datadir}/nut/solaris-init
%clean %clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -145,7 +142,6 @@ install -D -m0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/nut.conf
%{_systemd_util_dir}/system-shutdown/nutshutdown %{_systemd_util_dir}/system-shutdown/nutshutdown
%{_sysusersdir}/nut.conf %{_sysusersdir}/nut.conf
%{_tmpfilesdir}/nut.conf %{_tmpfilesdir}/nut.conf
%{_tmpfilesdir}/nut-common-tmpfiles.conf
%{python27_sitearch}/PyNUT.py %{python27_sitearch}/PyNUT.py
%{python27_sitearch}/test_nutclient.py %{python27_sitearch}/test_nutclient.py
%{python3_sitearch}/PyNUT.py %{python3_sitearch}/PyNUT.py
@ -185,6 +181,9 @@ install -D -m0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/nut.conf
%doc NEWS README %doc NEWS README
%changelog %changelog
* Mon Dec 04 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 2.8.1-2mamba
- fix for duplicate tmpfilesdir conf provided
* Wed Nov 08 2023 Automatic Build System <autodist@mambasoft.it> 2.8.1-1mamba * Wed Nov 08 2023 Automatic Build System <autodist@mambasoft.it> 2.8.1-1mamba
- automatic version update by autodist - automatic version update by autodist