Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package avrdude for openSUSE:Factory checked in at 2022-03-07 18:36:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/avrdude (Old) and /work/SRC/openSUSE:Factory/.avrdude.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "avrdude" Mon Mar 7 18:36:06 2022 rev:36 rq:960031 version:6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/avrdude/avrdude.changes 2022-03-05 14:45:17.115729205 +0100 +++ /work/SRC/openSUSE:Factory/.avrdude.new.1958/avrdude.changes 2022-03-07 18:36:07.314572153 +0100 @@ -1,0 +2,6 @@ +Mon Mar 7 16:11:33 UTC 2022 - Martin Wilck <[email protected]> + +- Add code for safe modprobe.d migration + (https://en.opensuse.org/openSUSE:Packaging_UsrEtc) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avrdude.spec ++++++ --- /var/tmp/diff_new_pack.xiwg4w/_old 2022-03-07 18:36:07.918571666 +0100 +++ /var/tmp/diff_new_pack.xiwg4w/_new 2022-03-07 18:36:07.922571663 +0100 @@ -19,6 +19,7 @@ # systemd-rpm-macros is wrong in 15.3 and below %define _modprobedir /lib/modprobe.d %endif +%global modprobe_d_files 50-avrdude_parport.conf %define libname lib%{name} %define libsoname %{libname}1 @@ -112,6 +113,13 @@ install -d -m 755 %{buildroot}%{_docdir}/%{name} install -m 644 AUTHORS COPYING NEWS README %{buildroot}%{_docdir}/%{name} +%pre +# Avoid restoring outdated stuff in posttrans +for _f in %{?modprobe_d_files}; do + [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \ + mv -f "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}.rpmsave.old" || : +done + %post %if %{?suse_version:1}0 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -132,6 +140,13 @@ %post -n %{libsoname} -p /sbin/ldconfig %postun -n %{libsoname} -p /sbin/ldconfig +%posttrans +# Migration of modprobe.conf files to _modprobedir +for _f in %{?modprobe_d_files}; do + [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \ + mv -fv "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}" || : +done + %files %defattr (-, root, root) %{_docdir}/%{name}
