pool/e2fsprogs
2
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Accepting request 849593 from home:lnussel:usrmove

Browse Source 
- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849593
OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=129
This commit is contained in:
Jan Kara 2020-11-20 11:13:53 +00:00 committed by Git OBS Bridge
parent 9f9d07f15a
commit 0ded56e120
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
e2fsprogs.changes
View File

@ -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> Sat May 2 09:44:11 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>

16
e2fsprogs.spec
View File

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