forked from pool/perl-local-lib
revert last change
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-local-lib?expand=0&rev=49
This commit is contained in:
@@ -7,8 +7,8 @@
|
||||
sources:
|
||||
- perl-homedir.sh
|
||||
- perl-homedir.csh
|
||||
patches:
|
||||
perl5.34_dedup.patch: -p1 PATCH-FIX-UPSTREAM inc_version_list now contains values which cause duplicate paths
|
||||
#patches:
|
||||
# foo.patch: -p1
|
||||
# bar.patch:
|
||||
#preamble: |-
|
||||
# BuildRequires: gcc-c++
|
||||
|
@@ -1,8 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 22 17:07:32 UTC 2021 - Dirk Stoecker <opensuse@dstoecker.de>
|
||||
|
||||
- add perl5.34_dedup.patch to fix duplicate paths
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 14 20:03:17 UTC 2021 - Dirk Stoecker <opensuse@dstoecker.de>
|
||||
|
||||
|
@@ -27,8 +27,6 @@ Source0: https://cpan.metacpan.org/authors/id/H/HA/HAARG/%{cpan_name}-%{v
|
||||
Source1: perl-homedir.sh
|
||||
Source2: perl-homedir.csh
|
||||
Source3: cpanspec.yml
|
||||
# PATCH-FIX-UPSTREAM inc_version_list now contains values which cause duplicate paths
|
||||
Patch0: perl5.34_dedup.patch
|
||||
BuildArch: noarch
|
||||
BuildRequires: perl
|
||||
BuildRequires: perl-macros
|
||||
@@ -75,7 +73,7 @@ When possible, these will be appended to instead of overwritten entirely.
|
||||
These values are then available for reference by any code after import.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{cpan_name}-%{version} -p1
|
||||
%autosetup -n %{cpan_name}-%{version}
|
||||
|
||||
%build
|
||||
perl Makefile.PL INSTALLDIRS=vendor
|
||||
|
@@ -1,12 +0,0 @@
|
||||
diff -ur local-lib-2.000024/lib/local/lib.pm local-lib-2.000024_fix/lib/local/lib.pm
|
||||
--- local-lib-2.000024/lib/local/lib.pm 2017-10-08 17:21:28.000000000 +0200
|
||||
+++ local-lib-2.000024_fix/lib/local/lib.pm 2021-09-22 19:04:37.510246455 +0200
|
||||
@@ -248,7 +248,7 @@
|
||||
[$_version, $_archname],
|
||||
[$_version],
|
||||
[$_archname],
|
||||
- (map [$_], @_inc_version_list),
|
||||
+ (map [$_], grep {$_ ne $_version && $_ ne "$_version/$_archname"} @_inc_version_list),
|
||||
[],
|
||||
);
|
||||
|
||||
|
Reference in New Issue
Block a user