diff --git a/globus-common-perl-5.26.patch b/globus-common-perl-5.26.patch deleted file mode 100644 index 8d14661..0000000 --- a/globus-common-perl-5.26.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a//scripts/Paths.pm.in b//scripts/Paths.pm.in -index 1459f3064e..a1e18a4ac3 100644 ---- a//scripts/Paths.pm.in -+++ b//scripts/Paths.pm.in -@@ -37,7 +37,7 @@ sub eval_path - my $evaluated; - eval "\$evaluated = \${$1}"; - -- $path =~ s/\${$varname}/$evaluated/g; -+ $path =~ s/\$\{$varname\}/$evaluated/g; - if ($path eq $last) - { - die "Error evaluating $last\n"; diff --git a/globus-common.spec b/globus-common.spec index 3612612..9a8a9ba 100644 --- a/globus-common.spec +++ b/globus-common.spec @@ -1,7 +1,7 @@ Name: globus-common %global _name %(tr - _ <<< %{name}) -Version: 17.1 -Release: 6%{?dist} +Version: 17.2 +Release: 1%{?dist} Summary: Globus Toolkit - Common Library License: ASL 2.0 @@ -9,9 +9,6 @@ URL: http://toolkit.globus.org/ Source: https://downloads.globus.org/toolkit/gt6/packages/%{_name}-%{version}.tar.gz # README file Source8: GLOBUS-CCOMMONLIB -# Adapt to perl 5.26 syntax -# https://github.com/globus/globus-toolkit/pull/110 -Patch0: %{name}-perl-5.26.patch Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) # Obsolete dropped packages from Globus Toolkit 4.2.1 @@ -108,7 +105,6 @@ Common Library Documentation Files %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 %build # Reduce overlinking @@ -208,6 +204,10 @@ make %{?_smp_mflags} check VERBOSE=1 NO_EXTERNAL_NET=1 %{?_licensedir: %license GLOBUS_LICENSE} %changelog +* Sun Oct 22 2017 Mattias Ellert - 17.2-1 +- GT6 update: Fix regex for perl 5.26 compatibility +- Drop patch globus-common-perl-5.26.patch (accepted upstream) + * Fri Aug 11 2017 Mattias Ellert - 17.1-6 - Adapt to perl 5.26 syntax diff --git a/sources b/sources index c41dcdf..1d9ce3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (globus_common-17.1.tar.gz) = 636904ff94d4df6c4e083533b9f6027301f6c3a2133efcbd0c3e43866ce90acbb6296ba3e3c47c1fefc8424d4b9e848d2328130f55e5c8874e397a243722d072 +SHA512 (globus_common-17.2.tar.gz) = c3b5dc2c354ad1f6d39d020caac0216648e1a6884190443160c2824192a7c9bfdcc12c42f31a6c90246bc715b6e5afcb126175d80d83f4854ca06d9a59c9fd31