diff --git a/perl-Bootloader-0.4.62.diff b/perl-Bootloader-0.4.62.diff new file mode 100644 index 0000000..c4879db --- /dev/null +++ b/perl-Bootloader-0.4.62.diff @@ -0,0 +1,18 @@ +diff -ru perl-Bootloader-0.4.62.orig/lib/Bootloader/Core/GRUB.pm perl-Bootloader-0.4.62/lib/Bootloader/Core/GRUB.pm +--- perl-Bootloader-0.4.62.orig/lib/Bootloader/Core/GRUB.pm 2008-05-20 10:45:55.000000000 +0200 ++++ perl-Bootloader-0.4.62/lib/Bootloader/Core/GRUB.pm 2008-06-03 23:57:29.506439000 +0200 +@@ -1640,6 +1640,14 @@ + "value" => $self->CreateChainloaderLine (\%sectinfo, $grub_root), + }; + } ++ elsif ($key eq "configfile") ++ { ++ # dummy/placeholder entry: do we need this? ++ push @lines, { ++ "key" => $key, ++ "value" => $value, ++ }; ++ } + } + + my $ret = $self->FixSectionLineOrder (\@lines, diff --git a/perl-Bootloader.changes b/perl-Bootloader.changes index 71fedb7..39c556e 100644 --- a/perl-Bootloader.changes +++ b/perl-Bootloader.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 3 23:58:13 CEST 2008 - coolo@suse.de + +- reverting the fix for minor bnc#389891 causing blocker bnc#395085 +- fixing perl dependency + ------------------------------------------------------------------- Thu May 29 11:51:02 CEST 2008 - aosthof@suse.de diff --git a/perl-Bootloader.spec b/perl-Bootloader.spec index e75e8b6..10c92a8 100644 --- a/perl-Bootloader.spec +++ b/perl-Bootloader.spec @@ -13,8 +13,8 @@ Name: perl-Bootloader Version: 0.4.62 -Release: 1 -Requires: perl >= %{perl_version} +Release: 3 +Requires: perl = %{perl_version} Requires: perl-gettext Requires: e2fsprogs AutoReqProv: on @@ -24,6 +24,7 @@ Summary: Library for Configuring Boot Loaders Source: perl-Bootloader-%{version}.tar.bz2 Source1: update-bootloader Source2: bootloader_entry +Patch0: perl-Bootloader-0.4.62.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build #!BuildIgnore: mdadm e2fsprogs limal-bootloader @@ -42,6 +43,7 @@ Authors: %prep %setup -q +%patch0 -p1 %build touch Makefile.PL @@ -67,6 +69,9 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader /usr/lib/bootloader %changelog +* Wed Jun 04 2008 coolo@suse.de +- reverting the fix for minor bnc#389891 causing blocker bnc#395085 +- fixing perl dependency * Thu May 29 2008 aosthof@suse.de - Corrected naming scheme for pae kernels (bnc#395085) - Version bump to 0.4.62