This commit is contained in:
parent
7b8d77988d
commit
77a60e66c4
25
no_Env.diff
Normal file
25
no_Env.diff
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
--- lib/Bootloader/Path.pm
|
||||||
|
+++ lib/Bootloader/Path.pm
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#!/usr/bin/perl -w
|
||||||
|
+#!/usr/bin/perl
|
||||||
|
#
|
||||||
|
# Set of path used in bootloader. Allows setting prefix via global variable
|
||||||
|
# $PERL_BOOTLOADER_TESTSUITE_PATH
|
||||||
|
@@ -9,15 +9,9 @@
|
||||||
|
|
||||||
|
use strict;
|
||||||
|
|
||||||
|
-use Env qw($PERL_BOOTLOADER_TESTSUITE_PATH);
|
||||||
|
-
|
||||||
|
sub Prefix {
|
||||||
|
my $value = shift;
|
||||||
|
- if ( defined($PERL_BOOTLOADER_TESTSUITE_PATH) )
|
||||||
|
- {
|
||||||
|
- $value = $PERL_BOOTLOADER_TESTSUITE_PATH . $value;
|
||||||
|
- }
|
||||||
|
- return $value;
|
||||||
|
+ return $ENV{PERL_BOOTLOADER_TESTSUITE_PATH} . $value;
|
||||||
|
}
|
||||||
|
|
||||||
|
sub Logname {
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 21 18:42:53 CEST 2008 - snwint@suse.de
|
||||||
|
|
||||||
|
- removed 'use Env' from Path.pm (bnc #410878)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jul 17 17:33:47 CEST 2008 - jreidinger@suse.cz
|
Thu Jul 17 17:33:47 CEST 2008 - jreidinger@suse.cz
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
Name: perl-Bootloader
|
Name: perl-Bootloader
|
||||||
Version: 0.4.64
|
Version: 0.4.64
|
||||||
Release: 1
|
Release: 4
|
||||||
Requires: perl-base = %{perl_version}
|
Requires: perl-base = %{perl_version}
|
||||||
Requires: e2fsprogs
|
Requires: e2fsprogs
|
||||||
Recommends: perl-gettext
|
Recommends: perl-gettext
|
||||||
@ -24,6 +24,7 @@ Summary: Library for Configuring Boot Loaders
|
|||||||
Source: perl-Bootloader-%{version}.tar.bz2
|
Source: perl-Bootloader-%{version}.tar.bz2
|
||||||
Source1: update-bootloader
|
Source1: update-bootloader
|
||||||
Source2: bootloader_entry
|
Source2: bootloader_entry
|
||||||
|
Patch: no_Env.diff
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
#!BuildIgnore: mdadm e2fsprogs limal-bootloader
|
#!BuildIgnore: mdadm e2fsprogs limal-bootloader
|
||||||
|
|
||||||
@ -42,6 +43,7 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch
|
||||||
|
|
||||||
%build
|
%build
|
||||||
touch Makefile.PL
|
touch Makefile.PL
|
||||||
@ -67,6 +69,8 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/bootloader
|
|||||||
/usr/lib/bootloader
|
/usr/lib/bootloader
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 21 2008 snwint@suse.de
|
||||||
|
- removed 'use Env' from Path.pm (bnc #410878)
|
||||||
* Thu Jul 17 2008 jreidinger@suse.cz
|
* Thu Jul 17 2008 jreidinger@suse.cz
|
||||||
- refactor pathnames, no it can be used
|
- refactor pathnames, no it can be used
|
||||||
$PERL_BOOTLOADER_TESTSUITE_PATH variable for prefix
|
$PERL_BOOTLOADER_TESTSUITE_PATH variable for prefix
|
||||||
|
Loading…
Reference in New Issue
Block a user