From 5780314e8d4fe83a9699c08ea55e1b520ed7840b461d44ad92ea746b32882970 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 2 Aug 2022 14:08:04 +0000 Subject: [PATCH] Accepting request 992317 from home:lnussel:branches:Base:System - move binaries from /sbin to /usr/sbin (boo#1191088) - remove /boot/boot.readme while at it so we stay out of there OBS-URL: https://build.opensuse.org/request/show/992317 OBS-URL: https://build.opensuse.org/package/show/Base:System/perl-Bootloader?expand=0&rev=263 --- perl-Bootloader.changes | 6 ++++++ perl-Bootloader.spec | 17 ++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes index de85097..e2d22a0 100644 --- a/perl-Bootloader.changes +++ b/perl-Bootloader.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 2 12:19:13 UTC 2022 - Ludwig Nussel + +- move binaries from /sbin to /usr/sbin (boo#1191088) +- remove /boot/boot.readme while at it so we stay out of there + ------------------------------------------------------------------- Mon Jun 20 12:41:29 UTC 2022 - Stefan Schubert diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec index fa81287..3e2cf38 100644 --- a/perl-Bootloader.spec +++ b/perl-Bootloader.spec @@ -16,6 +16,12 @@ # +%if 0%{suse_version} > 1550 +%define sbindir %{_sbindir} +%else +%define sbindir /sbin +%endif + Name: perl-Bootloader Version: 0.939 Release: 0 @@ -59,6 +65,11 @@ A command line interface to perl-Bootloader using YAML files for input and outpu %install make DESTDIR=$RPM_BUILD_ROOT install +%if %{suse_version} > 1550 +mv %{buildroot}/sbin/* %{buildroot}%{_sbindir} +ln -sf ../../sbin/pbl %{buildroot}/usr/lib/bootloader/bootloader_entry +rm $RPM_BUILD_ROOT/boot/boot.readme +%endif install -d -m 700 $RPM_BUILD_ROOT/var/log/YaST2 touch $RPM_BUILD_ROOT/var/log/pbl.log %perl_process_packlist @@ -102,15 +113,15 @@ chmod 600 /var/log/pbl.log %defattr(-, root, root) %license COPYING %doc %{_mandir}/man?/* +%doc boot.readme %{perl_vendorarch}/auto/Bootloader %{perl_vendorlib}/Bootloader %if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130 /var/adm/perl-modules/perl-Bootloader %endif -/sbin/update-bootloader -/sbin/pbl +%{sbindir}/update-bootloader +%{sbindir}/pbl /usr/lib/bootloader -/boot/boot.readme %if 0%{?suse_version} > 1500 %{_distconfdir}/logrotate.d/pbl %else