- release 1.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/perl-Bootloader?expand=0&rev=271

perl-Bootloader-0.941.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b3059f2e0cebb677fce10e917b1bc381eb7ba8ff98bb7e7edfcbc41e26526632
-size 165804

perl-Bootloader-1.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5dee1e243b425e2cb7393bf4a38d3bba337d562416b0d7c14b9a2cbe05ebecae
+size 166796

perl-Bootloader.changes

@@ -1,3 +1,21 @@
+--------------------------------------------------------------------
+Mon Apr 24 17:38:14 UTC 2023 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/perl-bootloader#143
+- adjust Makefile for usrmerge and legacy package split
+- move obs spec file to git repo
+- split off old perl code to perl-Bootloader-legacy package
+- remove legacy part completely
+- 1.0
+
+--------------------------------------------------------------------
+Mon Apr 24 15:07:57 UTC 2023 - wfeldt@opensuse.org
+
+- merge gh#openSUSE/perl-bootloader#142
+- use fw_platform_size to distinguish between 32 bit and 64 bit
+  UEFI platforms (bsc#1208003)
+- 0.942
+
 --------------------------------------------------------------------
 Thu Jan 12 17:30:54 UTC 2023 - wfeldt@opensuse.org
 

perl-Bootloader.spec

@@ -16,47 +16,32 @@
 #
 
 
-%if 0%{suse_version} > 1550
+%if 0%{?usrmerged}
 %define sbindir %{_sbindir}
 %else
 %define sbindir /sbin
 %endif
 
+%{!?_distconfdir:%global _distconfdir /etc}
+
 Name:           perl-Bootloader
-Version:        0.941
+Version:        1.0
 Release:        0
 Requires:       coreutils
 Requires:       perl-base = %{perl_version}
-Recommends:     perl-gettext
+Provides:       perl-Bootloader-YAML = %{version}
-Summary:        Library for Configuring Boot Loaders
+Obsoletes:      perl-Bootloader-YAML < %{version}
+Summary:        Tool for boot loader configuration
 License:        GPL-2.0-or-later
 Group:          System/Boot
+URL:            https://github.com/openSUSE/perl-bootloader
 Source:         %{name}-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  perl
-Conflicts:      multipath-tools < 0.4.8-40.25.1
 #!BuildIgnore: mdadm e2fsprogs limal-bootloader
 
 %description
-Perl modules for configuring various boot loaders.
+Shell script wrapper for configuring various boot loaders.
-
-
-
-Authors:
---------
-    Jiri Srain <jsrain@suse.cz>
-    Joachim Plack <jplack@suse.de>
-    Alexander Osthof <aosthof@suse.de>
-    Josef Reidinger <jreidinger@suse.cz>
-
-%package YAML
-Requires:       %{name} = %{version}
-Requires:       perl-YAML-LibYAML
-Summary:        YAML interface for perl-Bootloader
-Group:          System/Boot
-
-%description YAML
-A command line interface to perl-Bootloader using YAML files for input and output.
 
 %prep
 %setup -q
@@ -64,46 +49,8 @@ A command line interface to perl-Bootloader using YAML files for input and outpu
 %build
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+make install DESTDIR=%{buildroot} SBINDIR=%{sbindir} ETCDIR=%{_distconfdir}
-%if %{suse_version} > 1550
+touch %{buildroot}/var/log/pbl.log
-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
-#install only needed files for bootloader for specific architecture
-%ifarch %ix86 x86_64
-rm -f $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{ZIPL*,PowerLILO*}
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man?/{*ZIPL*,*PowerLILO*}
-%if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130
-sed -i '/ZIPL/D;/PowerLILO/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist
-%endif
-%endif
-%ifarch ppc ppc64
-rm -f $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{ZIPL*,LILO*,ELILO*,GRUB.*}
-%if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130
-sed -i '/ZIPL/D;/ELILO/D;/\/LILO/D;/GRUB/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist
-%endif
-%endif
-%ifarch s390 s390x
-rm -f $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{*LILO*,GRUB.*,GRUB2EFI.*}
-%if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130
-sed -i '/LILO/D;/GRUB/D;' $RPM_BUILD_ROOT/%{perl_vendorarch}/auto/Bootloader/.packlist
-%endif
-%endif
-%ifarch ia32 ia64
-rm -f $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{LILO*,GRUB*,ZIPL*,PowerLILO*}
-%if 0%{?suse_version} == 0 || 0%{?suse_version} <= 1130
-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
@@ -112,26 +59,16 @@ chmod 600 /var/log/pbl.log
 %files
 %defattr(-, root, root)
 %license COPYING
-%doc %{_mandir}/man?/*
+%doc %{_mandir}/man8/*
 %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
 %{sbindir}/update-bootloader
 %{sbindir}/pbl
 /usr/lib/bootloader
-%if 0%{?suse_version} > 1500
+%if "%{_distconfdir}" == "/etc"
-%{_distconfdir}/logrotate.d/pbl
+%config(noreplace) %{_distconfdir}/logrotate.d/pbl
 %else
-%config(noreplace) %{_sysconfdir}/logrotate.d/pbl
+%{_distconfdir}/logrotate.d/pbl
 %endif
-%dir %attr(0700,root,root) /var/log/YaST2
 %ghost %attr(0600,root,root) /var/log/pbl.log
 
-%files YAML
-%defattr(-, root, root)
-%{_sbindir}/pbl-yaml
-
 %changelog