Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package elilo for openSUSE:Factory checked in at 2022-08-19 17:53:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/elilo (Old) and /work/SRC/openSUSE:Factory/.elilo.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "elilo" Fri Aug 19 17:53:36 2022 rev:33 rq:998003 version:3.16 Changes: -------- --- /work/SRC/openSUSE:Factory/elilo/elilo.changes 2021-02-23 20:17:45.783515562 +0100 +++ /work/SRC/openSUSE:Factory/.elilo.new.2083/elilo.changes 2022-08-19 17:54:48.635890628 +0200 @@ -1,0 +2,6 @@ +Tue Aug 16 14:30:43 UTC 2022 - [email protected] + +- elilo.spec, elilo.pl + * Move to '/usr/sbin'. (bsc#1191059) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ elilo.spec ++++++ --- /var/tmp/diff_new_pack.4siZtJ/_old 2022-08-19 17:54:49.819893110 +0200 +++ /var/tmp/diff_new_pack.4siZtJ/_new 2022-08-19 17:54:49.823893117 +0200 @@ -80,6 +80,8 @@ # work around b0rked 'Str'-ops in newer 'gnu-efi' ... :-( find . -type f -name '*.[ch]' -print0 | xargs -0rn 1 \ perl -pi -e 's{Str(Chr|n(X?Cpy|Cat))}{eliloStr$1}g' +# facilitate UsrMerge (bsc#1191059) below +%define sbin /usr/sbin %build perl -pi -e 's{/usr/lib}{%{_libdir}}' Make.defaults @@ -94,6 +96,8 @@ perl -pe 's{\@EDITION\@}{%{version}}; s{\@LIBDIR\@}{%{_libdir}}; s{\@ARCH\@}{%{_target_cpu}}; + s{/s(bin/get_kernel)}{/usr/$1}; + s{/sbin/(elilo)}{%{sbin}/$1}; ' < %{SOURCE1} > elilo.pl && chmod 555 elilo.pl && touch -r %{SOURCE1} elilo.pl ! grep -F '%%{version}' elilo.pl @@ -102,10 +106,10 @@ touch -r elilo.pl elilo.8 %install -install -d $RPM_BUILD_ROOT%{_libdir}/efi $RPM_BUILD_ROOT/sbin +install -d $RPM_BUILD_ROOT%{_libdir}/efi $RPM_BUILD_ROOT%{sbin} install -p -m 444 elilo.efi $RPM_BUILD_ROOT%{_libdir}/efi -install tools/eliloalt $RPM_BUILD_ROOT/sbin -install -p -m 555 elilo.pl $RPM_BUILD_ROOT/sbin/elilo +install tools/eliloalt $RPM_BUILD_ROOT%{sbin} +install -p -m 555 elilo.pl $RPM_BUILD_ROOT%{sbin}/elilo install -D -p -m 644 elilo.8 $RPM_BUILD_ROOT/usr/share/man/man8/elilo.8 install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/man/man8/eliloalt.8 install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/usr/share/man/man5/elilo.conf.5 @@ -116,7 +120,7 @@ if [ -r /etc/sysconfig/bootloader ]; then . /etc/sysconfig/bootloader if [ "$LOADER_TYPE" = "elilo" -a -r /etc/elilo.conf ]; then - /sbin/elilo -v || : + %{sbin}/elilo -v || : fi fi @@ -124,8 +128,8 @@ %defattr(-, root, root) %doc README README.* TODO docs/*.txt RELEASE-NOTES %{_libdir}/efi -/sbin/elilo -/sbin/eliloalt +%{sbin}/elilo +%{sbin}/eliloalt /usr/share/man/man5/* /usr/share/man/man8/*
