From 8e0dcfcceb3ff335b2bec3fb98ca1bb30e200601 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 13 Nov 2014 08:40:34 +0100 Subject: [PATCH] 2.000014 bump --- .gitignore | 1 + ...-1.008009-Append-semicolon-to-setenv.patch | 12 ----- ...ix-setting-undefined-variable-in-CSH.patch | 48 ------------------- perl-local-lib.spec | 38 +++++++++------ sources | 2 +- 5 files changed, 25 insertions(+), 76 deletions(-) delete mode 100644 local-lib-1.008009-Append-semicolon-to-setenv.patch delete mode 100644 local-lib-1.008010-Fix-setting-undefined-variable-in-CSH.patch diff --git a/.gitignore b/.gitignore index 93d279c..662df38 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ local-lib-1.004009.tar.gz /local-lib-1.008007.tar.gz /local-lib-1.008009.tar.gz /local-lib-1.008010.tar.gz +/local-lib-2.000014.tar.gz diff --git a/local-lib-1.008009-Append-semicolon-to-setenv.patch b/local-lib-1.008009-Append-semicolon-to-setenv.patch deleted file mode 100644 index 6462020..0000000 --- a/local-lib-1.008009-Append-semicolon-to-setenv.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up local-lib-1.008009/lib/local/lib.pm.orig local-lib-1.008009/lib/local/lib.pm ---- local-lib-1.008009/lib/local/lib.pm.orig 2013-02-24 20:37:08.000000000 -0700 -+++ local-lib-1.008009/lib/local/lib.pm 2013-04-19 08:58:58.161710254 -0600 -@@ -343,7 +343,7 @@ sub build_bourne_env_declaration { - sub build_csh_env_declaration { - my $class = shift; - my($name, $value) = @_; -- return defined($value) ? qq{setenv ${name} "${value}"\n} : qq{unsetenv ${name}\n}; -+ return defined($value) ? qq{setenv ${name} "${value}";\n} : qq{unsetenv ${name};\n}; - } - - sub build_win32_env_declaration { diff --git a/local-lib-1.008010-Fix-setting-undefined-variable-in-CSH.patch b/local-lib-1.008010-Fix-setting-undefined-variable-in-CSH.patch deleted file mode 100644 index 9005842..0000000 --- a/local-lib-1.008010-Fix-setting-undefined-variable-in-CSH.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 53297b1441539efdc44fc9c8f4f19fb6ba8290c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Thu, 21 Nov 2013 12:03:32 +0100 -Subject: [PATCH] Fix setting undefined variable in CSH -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - - -Signed-off-by: Petr Písař ---- - lib/local/lib.pm | 19 ++++++++++++++++++- - 1 file changed, 18 insertions(+), 1 deletion(-) - -diff --git a/lib/local/lib.pm b/lib/local/lib.pm -index 289e13b..d4f8e2a 100644 ---- a/lib/local/lib.pm -+++ b/lib/local/lib.pm -@@ -343,7 +343,24 @@ sub build_bourne_env_declaration { - sub build_csh_env_declaration { - my $class = shift; - my($name, $value) = @_; -- return defined($value) ? qq{setenv ${name} "${value}";\n} : qq{unsetenv ${name};\n}; -+ if (defined($value)) { -+ if ($value =~ /(.*)(\A|\Q$Config{path_sep}\E)(\$)(.+?)(\z|\Q$Config{path_sep}\E)(.*)/) { -+ # If a variable reference exists in the value, we have to delimit it and -+ # dereference it only if it is defined. -+ return -+ qq{test 1 == \$\{?$4\} && } . -+ qq{setenv ${name} "${1}${2}${3}\{${4}\}${5}${6}"} . -+ qq{ || } . -+ qq{setenv ${name} "${1}} . -+ (($2 ne '' and $5 ne '') ? qq{${2}} : '') . -+ qq{${6}"} . -+ qq{;\n}; -+ } else { -+ return qq{setenv ${name} "${value}";\n}; -+ } -+ } else { -+ return qq{unsetenv ${name};\n}; -+ } - } - - sub build_win32_env_declaration { --- -1.8.3.1 - diff --git a/perl-local-lib.spec b/perl-local-lib.spec index 201498a..1b662d8 100644 --- a/perl-local-lib.spec +++ b/perl-local-lib.spec @@ -1,16 +1,11 @@ Name: perl-local-lib -Version: 1.008010 -Release: 8%{?dist} +Version: 2.000014 +Release: 1%{?dist} # lib/local/lib.pm -> GPL+ or Artistic License: GPL+ or Artistic Group: Development/Libraries Summary: Create and use a local lib/ for perl modules -Source: http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/local-lib-%{version}.tar.gz -# Allow evaluation in CSH, RHBZ #849609, CPAN RT #60072 -Patch0: local-lib-1.008009-Append-semicolon-to-setenv.patch -# Fix setting variables in CSH, RHBZ# 1033018, CPAN RT #85667, -# upstream is going the refactor the whole code, patch not sent to upstream -Patch1: local-lib-1.008010-Fix-setting-undefined-variable-in-CSH.patch +Source: http://search.cpan.org/CPAN/authors/id/H/HA/HAARG/local-lib-%{version}.tar.gz Url: http://search.cpan.org/dist/local-lib Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) BuildArch: noarch @@ -19,18 +14,31 @@ Source10: perl-homedir.sh Source11: perl-homedir.csh BuildRequires: perl(Carp) +BuildRequires: perl(Carp::Heavy) +BuildRequires: perl(Config) BuildRequires: perl(Cwd) BuildRequires: perl(CPAN) >= 1.82 BuildRequires: perl(ExtUtils::Install) >= 1.43 -BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42 -BuildRequires: perl(File::Path) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.74 +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Glob) BuildRequires: perl(File::Spec) BuildRequires: perl(inc::Module::Install) BuildRequires: perl(Module::Build) >= 0.36 +BuildRequires: perl(strict) +BuildRequires: perl(warnings) # Tests only -BuildRequires: perl(Capture::Tiny) +BuildRequires: perl(base) +BuildRequires: perl(Data::Dumper) +BuildRequires: perl(Exporter) +BuildRequires: perl(File::Path) BuildRequires: perl(File::Temp) -BuildRequires: perl(Test::More) +BuildRequires: perl(IPC::Open3) +BuildRequires: perl(lib) +BuildRequires: perl(Test::More) >= 0.81 +Requires: perl(File::Glob) +Requires: perl(File::Spec) + %{?perl_default_filter} @@ -68,9 +76,6 @@ install this package. %prep %setup -q -n local-lib-%{version} -%patch0 -p1 -%patch1 -p1 -rm -rf inc %build perl Makefile.PL INSTALLDIRS=vendor @@ -96,6 +101,9 @@ make test %{_sysconfdir}/profile.d/* %changelog +* Tue Nov 11 2014 Jitka Plesnikova - 2.000014-1 +- 2.000014 bump + * Thu Aug 28 2014 Jitka Plesnikova - 1.008010-8 - Perl 5.20 rebuild diff --git a/sources b/sources index a2c1f41..e0314b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5573c46eac26e589c5542c03925ae87 local-lib-1.008010.tar.gz +74768258dbe9a3cd030aaf08f5b19c8d local-lib-2.000014.tar.gz