commit perl-Bootloader for openSUSE:Factory
Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at Fri Jan 7 10:40:08 CET 2011. -------- --- perl-Bootloader/perl-Bootloader.changes 2010-10-19 11:55:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2011-01-04 14:29:46.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Jan 4 13:12:51 UTC 2011 - jreidinger@novell.com + +- fix build with new perl missing .packlist +- fix malformed xen append (bnc#657911) +- 0.5.15 + +------------------------------------------------------------------- +Mon Dec 6 18:02:40 UTC 2010 - jreidinger@novell.com + +- fix creating new xen section with vga mode +- 0.5.14 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- perl-Bootloader-0.5.13.tar.bz2 New: ---- perl-Bootloader-0.5.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.jKA4Nq/_old 2011-01-07 10:37:10.000000000 +0100 +++ /var/tmp/diff_new_pack.jKA4Nq/_new 2011-01-07 10:37:10.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package perl-Bootloader (Version 0.5.13) +# spec file for package perl-Bootloader (Version 0.5.15) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: perl-Bootloader -Version: 0.5.13 +Version: 0.5.15 Release: 1 Requires: perl-base = %{perl_version} Requires: e2fsprogs @@ -55,7 +55,7 @@ touch Makefile.PL perl -MExtUtils::MakeMaker -e 'WriteMakefile (NAME => "Bootloader")' make %{?_smp_mflags} -pod2man %{SOURCE1} | gzip > update-Bootloader.8.gz +pod2man %{SOURCE1} | gzip > update-bootloader.8.gz %install make DESTDIR=$RPM_BUILD_ROOT install_vendor @@ -67,25 +67,33 @@ install -d -m 755 $RPM_BUILD_ROOT/boot install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/boot/ install -d -m 755 $RPM_BUILD_ROOT/usr/share/man/man8/ -install -m 644 update-Bootloader.8.gz $RPM_BUILD_ROOT/usr/share/man/man8/ +install -m 644 update-bootloader.8.gz $RPM_BUILD_ROOT/usr/share/man/man8/ #install only needed files for bootloader for specific architecture %ifarch %ix86 x86_64 rm $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{ZIPL*,PowerLILO*} rm $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 $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 $RPM_BUILD_ROOT/%{perl_vendorlib}/Bootloader/Core/{*LILO*,GRUB*} +%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 $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 %files %defattr(-, root, root) @@ -93,7 +101,9 @@ %doc %{_mandir}/man?/* %{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 /usr/lib/bootloader /boot/boot.readme ++++++ perl-Bootloader-0.5.13.tar.bz2 -> perl-Bootloader-0.5.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.5.13/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.5.15/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.5.13/lib/Bootloader/Core/GRUB.pm 2010-08-24 15:50:51.000000000 +0200 +++ new/perl-Bootloader-0.5.15/lib/Bootloader/Core/GRUB.pm 2011-01-03 14:30:13.000000000 +0100 @@ -1089,7 +1089,7 @@ $xen_append =~ s/(.*)${del_console}=\w+\s*(.*)$/$1$2/g; } - $xen_append =~ s/\s*(\S*)\s*$/$1/; + $xen_append =~ s/^\s*(\S*)\s*$/$1/; $ret{"xen_append"} = "console=$console $speed $xen_append"; } else { $ret{"xen_append"} = "console=$console $speed"; @@ -1555,7 +1555,7 @@ my $xen = $self->UnixPath2GrubPath (delete($sectinfo{"xen"}), $grub_root); my $append = (delete($sectinfo{"xen_append"}) || ""); my $vga = $sectinfo{"vgamode"} || ""; - $vga = "vgamode=$vga " if $vga ne ""; + $vga = "vga=mode-$vga " if $vga ne ""; my $value = "$xen $vga$append"; push @lines, { "key" => "kernel", ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de