Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libpsm2 for openSUSE:Factory checked
in at 2022-03-09 18:46:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libpsm2 (Old)
and /work/SRC/openSUSE:Factory/.libpsm2.new.2349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpsm2"
Wed Mar 9 18:46:56 2022 rev:19 rq:960138 version:11.2.203
Changes:
--------
--- /work/SRC/openSUSE:Factory/libpsm2/libpsm2.changes 2021-09-08
21:36:45.973898969 +0200
+++ /work/SRC/openSUSE:Factory/.libpsm2.new.2349/libpsm2.changes
2022-03-11 11:46:37.766908348 +0100
@@ -1,0 +2,5 @@
+Fri Mar 4 12:41:50 UTC 2022 - Martin Wilck <mwi...@suse.com>
+
+- move modprobe.conf files to %_modprobedir (bsc#1196275, jsc#SLE-20639)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libpsm2.spec ++++++
--- /var/tmp/diff_new_pack.bzy6cp/_old 2022-03-11 11:46:38.278907839 +0100
+++ /var/tmp/diff_new_pack.bzy6cp/_new 2022-03-11 11:46:38.282907836 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libpsm2
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,11 @@
#
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150300
+%define _modprobedir /lib/modprobe.d
+%endif
+%global modprobe_d_files libpsm2-compat.conf
+
%define git_ver %{nil}
%define psm_so 2
@@ -94,7 +99,8 @@
%install
export DESTDIR=%{buildroot}
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+modprobe_dir=%{_modprobedir}
+make %{?_smp_mflags} DESTDIR=%{buildroot}
LIBPSM2_COMPAT_CONF_DIR="${modprobe_dir%/*}" install
install -m0644 %{buildroot}%{_libdir}/psm2-compat/libpsm_infinipath.so.1
%{buildroot}%{_libdir}/libpsm_infinipath.so.1
# removing file to get rid of rpm errors
rm %{buildroot}%{_libdir}/psm2-compat/libpsm_infinipath.so.1
@@ -102,11 +108,25 @@
# remove static library
rm %{buildroot}%{_libdir}/libpsm2.a
+%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 -n %{name}-%{psm_so} -p /sbin/ldconfig
%postun -n %{name}-%{psm_so} -p /sbin/ldconfig
%post compat -p /sbin/ldconfig
%postun compat -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 -n %{name}-%{psm_so}
%defattr(-,root,root,-)
%{_libdir}/libpsm2.so.*
@@ -140,10 +160,10 @@
%files compat
%defattr(-,root,root,-)
-%dir %{_sysconfdir}/modprobe.d
+%dir %{_modprobedir}
%{_libdir}/libpsm_infinipath.so.*
%{_udevrulesdir}/40-psm-compat.rules
-%config %{_sysconfdir}/modprobe.d/libpsm2-compat.conf
+%config %{_modprobedir}/libpsm2-compat.conf
%changelog
