From ce63c8d3757922b6e5ec79e0c4c21c6674e48d30ca33ae48f68b14c2be5ed4ef Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 6 Jul 2022 11:26:30 +0000 Subject: [PATCH] Accepting request 984142 from home:schubi2 - Moved logrotate files from user specific directory /etc/logrotate.d to vendor specific directory /usr/etc/logrotate.d. OBS-URL: https://build.opensuse.org/request/show/984142 OBS-URL: https://build.opensuse.org/package/show/Base:System/perl-Bootloader?expand=0&rev=261 --- perl-Bootloader.changes | 6 ++++++ perl-Bootloader.spec | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes index 09a80fd..de85097 100644 --- a/perl-Bootloader.changes +++ b/perl-Bootloader.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 20 12:41:29 UTC 2022 - Stefan Schubert + +- Moved logrotate files from user specific directory /etc/logrotate.d + to vendor specific directory /usr/etc/logrotate.d. + -------------------------------------------------------------------- Wed Apr 27 14:22:43 UTC 2022 - wfeldt@opensuse.org diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec index 00ed801..fa81287 100644 --- a/perl-Bootloader.spec +++ b/perl-Bootloader.spec @@ -1,7 +1,7 @@ # # spec file for package perl-Bootloader # -# Copyright (c) 2022 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -52,7 +52,6 @@ Group: System/Boot %description YAML A command line interface to perl-Bootloader using YAML files for input and output. - %prep %setup -q @@ -89,6 +88,11 @@ rm -f $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{LILO*,GRUB*,ZIPL*,Power sed -i '/ZIPL/D;/PowerLILO/D;/\/LILO/D;/GRUB/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist %endif %endif +# move logrotate files from /etc/logrotate.d to /usr/etc/logrotate.d +%if 0%{?suse_version} > 1500 +mkdir -p %{buildroot}%{_distconfdir}/logrotate.d +mv %{buildroot}/%{_sysconfdir}/logrotate.d/pbl %{buildroot}%{_distconfdir}/logrotate.d +%endif %post echo -n >>/var/log/pbl.log @@ -107,7 +111,11 @@ chmod 600 /var/log/pbl.log /sbin/pbl /usr/lib/bootloader /boot/boot.readme -/etc/logrotate.d/pbl +%if 0%{?suse_version} > 1500 +%{_distconfdir}/logrotate.d/pbl +%else +%config(noreplace) %{_sysconfdir}/logrotate.d/pbl +%endif %dir %attr(0700,root,root) /var/log/YaST2 %ghost %attr(0600,root,root) /var/log/pbl.log