Accepting request 849645 from filesystems

OBS-URL: https://build.opensuse.org/request/show/849645
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=113

e2fsprogs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 29 10:31:32 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Sat May  2 09:44:11 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
 

e2fsprogs.spec

@@ -287,7 +287,7 @@ make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_libdir}
 
 rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
 
-#UsrMerge
+%if !0%{?usrmerged}
 mkdir %{buildroot}/sbin
 ln -s %{_sbindir}/badblocks %{buildroot}/sbin/badblocks
 ln -s %{_sbindir}/debugfs   %{buildroot}/sbin/debugfs
@@ -314,7 +314,7 @@ popd
 for libName in $LIBNAMES;
   do ln -s %{_libdir}/$libName %{buildroot}/%{_lib};
 done
-#EndUsrMerge
+%endif
 
 %if %{with systemd}
 %if %{build_mini}
@@ -403,7 +403,7 @@ done
 %license NOTICE
 %endif
 %config /etc/mke2fs.conf
-#UsrMerge 
+%if !0%{?usrmerged}
 /sbin/badblocks
 /sbin/debugfs
 /sbin/dumpe2fs
@@ -422,7 +422,7 @@ done
 /sbin/tune2fs
 /sbin/e2image
 /sbin/logsave
-#EndUsrMerge
+%endif
 %{_sbindir}/badblocks
 %{_sbindir}/debugfs
 %{_sbindir}/dumpe2fs
@@ -487,10 +487,10 @@ done
 %files -n libext2fs2
 %endif
 %defattr(-, root, root)
-#UsrMerge
+%if !0%{?usrmerged}
 /%{_lib}/libext2fs.so.*
 /%{_lib}/libe2p.so.*
-#EndUsrMerge
+%endif
 %{_libdir}/libext2fs.so.*
 %{_libdir}/libe2p.so.*
 
@@ -513,10 +513,10 @@ done
 %files -n libcom_err2
 %endif
 %defattr(-, root, root)
-#UsrMerge
+%if !0%{?usrmerged}
 /%{_lib}/libcom_err.so.*
 /%{_lib}/libss.so.*
-#EndUsrMerge
+%endif
 %{_libdir}/libcom_err.so.*
 %{_libdir}/libss.so.*