Hello community, here is the log from the commit of package lvm2 for openSUSE:Factory checked in at 2020-12-09 22:11:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lvm2 (Old) and /work/SRC/openSUSE:Factory/.lvm2.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lvm2" Wed Dec 9 22:11:50 2020 rev:142 rq:853682 version:2.03.10 Changes: -------- --- /work/SRC/openSUSE:Factory/lvm2/lvm2.changes 2020-11-30 09:53:24.597753259 +0100 +++ /work/SRC/openSUSE:Factory/.lvm2.new.2328/lvm2.changes 2020-12-09 22:11:50.975093087 +0100 @@ -1,0 +2,5 @@ +Thu Nov 26 10:28:13 UTC 2020 - Ludwig Nussel <[email protected]> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.etzANT/_old 2020-12-09 22:11:51.911094036 +0100 +++ /var/tmp/diff_new_pack.etzANT/_new 2020-12-09 22:11:51.915094039 +0100 @@ -224,8 +224,10 @@ rm %{buildroot}%{_mandir}/man8/blkdeactivate.8 # compat symlinks in /sbin remove with Leap 43 +%if !0%{?usrmerged} mkdir -p %{buildroot}/sbin ln -s %{_sbindir}/dmsetup %{buildroot}/sbin/dmsetup +%endif %else %if %{with lockd} make DESTDIR=%{buildroot} \ @@ -298,6 +300,7 @@ rm %{buildroot}%{_mandir}/man8/dmsetup.8 rm %{buildroot}%{_mandir}/man8/dmeventd.8 +%if !0%{?usrmerged} # compat symlinks in /sbin remove with Leap 43 mkdir -p %{buildroot}/sbin pushd %{buildroot}/%{_sbindir} @@ -307,6 +310,7 @@ popd %endif %endif +%endif %if %{with devicemapper} %package -n device-mapper @@ -341,7 +345,9 @@ %license COPYING COPYING.LIB %doc README %doc udev/12-dm-permissions.rules +%if !0%{?usrmerged} /sbin/dmsetup +%endif %{_sbindir}/dmsetup %{_sbindir}/dmeventd %{_sbindir}/dmstats @@ -370,6 +376,8 @@ %{_libdir}/libdevmapper.so.1.02 %post -n %{libname} +%if !0%{?usrmerged} +# in usrmerged scenario we better don't remove ourselves :-) if [ -f /%{_lib}/libdevmapper.so.1.03 ]; then # Special migration - the library is now in %{_libdir}, but up to the point where # zypp removes the 'old' device-mapper package, the old library 'wins' the ldloader race @@ -378,7 +386,8 @@ # Remove /%{_lib}/libdevmapper.so.1.02 - and the run ldconfig rm /%{_lib}/libdevmapper.so.1.03 fi - /sbin/ldconfig +%endif +/sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -542,6 +551,7 @@ %{_sbindir}/rclvm2-lvmpolld %{_sbindir}/rclvm2-monitor # compat symlinks in /sbin +%if !0%{?usrmerged} /sbin/lvm /sbin/lvmconfig /sbin/lvmdump @@ -588,6 +598,7 @@ /sbin/vgs /sbin/vgscan /sbin/vgsplit +%endif %{_mandir}/man5/lvm.conf.5%{?ext_man} %{_mandir}/man7/lvmcache.7%{?ext_man} %{_mandir}/man7/lvmraid.7%{?ext_man} _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
