8
0
Ruediger Oertel
2012-03-06 16:50:15 +00:00
committed by Git OBS Bridge
parent b8f1b0e8a9
commit 3ab4abab87
3 changed files with 13 additions and 93 deletions

View File

@@ -1,85 +0,0 @@
Index: File-Remove-1.49/lib/File/Remove.pm
===================================================================
--- File-Remove-1.49.orig/lib/File/Remove.pm
+++ File-Remove-1.49/lib/File/Remove.pm
@@ -14,7 +14,7 @@ BEGIN {
# If we ever need a Mac::Glue object we will want to cache it.
my $glue;
-
+use lib '__vendorperl__';
use File::Path ();
use File::Glob ();
use File::Spec 3.2701 ();
Index: File-Remove-1.49/t/03_deep_readonly.t
===================================================================
--- File-Remove-1.49.orig/t/03_deep_readonly.t
+++ File-Remove-1.49/t/03_deep_readonly.t
@@ -8,6 +8,7 @@ BEGIN {
$^W = 1;
}
+use lib '__vendorperl__';
use Test::More tests => 12;
use File::Spec::Functions ':ALL';
use File::Copy ();
Index: File-Remove-1.49/t/04_can_delete.t
===================================================================
--- File-Remove-1.49.orig/t/04_can_delete.t
+++ File-Remove-1.49/t/04_can_delete.t
@@ -8,6 +8,7 @@ BEGIN {
$^W = 1;
}
+use lib '__vendorperl__';
use Test::More tests => 12;
use File::Spec::Functions ':ALL';
use File::Copy ();
Index: File-Remove-1.49/t/05_links.t
===================================================================
--- File-Remove-1.49.orig/t/05_links.t
+++ File-Remove-1.49/t/05_links.t
@@ -6,6 +6,7 @@ BEGIN {
$^W = 1;
}
+use lib '__vendorperl__';
use Test::More;
use File::Spec::Functions ':ALL';
use File::Remove ();
Index: File-Remove-1.49/t/06_curly.t
===================================================================
--- File-Remove-1.49.orig/t/06_curly.t
+++ File-Remove-1.49/t/06_curly.t
@@ -10,6 +10,7 @@ BEGIN {
$^W = 1;
}
+use lib '__vendorperl__';
use Test::More tests => 6;
use File::Spec::Functions ':ALL';
use File::Remove ();
Index: File-Remove-1.49/t/07_cwd.t
===================================================================
--- File-Remove-1.49.orig/t/07_cwd.t
+++ File-Remove-1.49/t/07_cwd.t
@@ -6,6 +6,7 @@ BEGIN {
$^W = 1;
}
+use lib '__vendorperl__';
use Test::More tests => 13;
use File::Spec::Functions ':ALL';
use File::Remove ();
Index: File-Remove-1.49/t/08_spaces.t
===================================================================
--- File-Remove-1.49.orig/t/08_spaces.t
+++ File-Remove-1.49/t/08_spaces.t
@@ -9,6 +9,7 @@ BEGIN {
$^W = 1;
}
+use lib '__vendorperl__';
use Test::More qw(no_plan);
use File::Spec::Functions ':ALL';
use File::Copy ();

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 6 17:49:07 CET 2012 - ro@suse.de
- fix build on sle11
-------------------------------------------------------------------
Fri Nov 18 11:49:33 UTC 2011 - coolo@suse.com

View File

@@ -1,7 +1,7 @@
#
# spec file for package perl-File-Remove
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 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
@@ -16,17 +16,15 @@
#
Name: perl-File-Remove
Version: 1.51
Release: 5
License: GPL-1.0+ or Artistic-1.0
Release: 0
%define cpan_name File-Remove
Summary: Remove files and directories
Url: http://search.cpan.org/dist/File-Remove/
License: GPL-1.0+ or Artistic-1.0
Group: Development/Libraries/Perl
Url: http://search.cpan.org/dist/File-Remove/
Source: http://www.cpan.org/authors/id/A/AD/ADAMK/File-Remove-%{version}.tar.gz
Patch1: perl-File-Remove-old_File-Spec.patch
BuildRequires: perl(Cwd) >= 3.27.01
BuildRequires: perl(File::Spec) >= 3.27.01
%if 0%{?suse_version} <= 1110
@@ -53,8 +51,10 @@ addition of an optional, infrequently used "other platforms" hashref.
%prep
%setup -q -n %{cpan_name}-%{version}
%if 0%{?suse_version} <= 1110
%patch1 -p1
sed -i "s|__vendorperl__|%{perl_vendorlib}|g" lib/File/Remove.pm t/*.t
for i in `find lib t -type f` ; do
sed -i -e "s@^\s*use\s\s*File::Spec@use lib '%{perl_vendorlib}';\nuse File::Spec@" $i
sed -i -e "s@^\s*use\s\s*Test::More@use lib '%{perl_vendorlib}';\nuse Test::More@" $i
done
%endif
%build