diff --git a/local-lib-1.008004-Append-semicolon-to-setenv.patch b/local-lib-1.008004-Append-semicolon-to-setenv.patch deleted file mode 100644 index 3cee543..0000000 --- a/local-lib-1.008004-Append-semicolon-to-setenv.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0bcf85f024efcb8067bad99c7e9b7dee64ff7edf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 20 Aug 2012 11:32:32 +0200 -Subject: [PATCH] Append semicolon to setenv - -This allows to "eval `perl -Mlocal::lib`" in CSH. - ---- - lib/local/lib.pm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/local/lib.pm b/lib/local/lib.pm -index 87d1869..cef5ebf 100644 ---- a/lib/local/lib.pm -+++ b/lib/local/lib.pm -@@ -333,7 +333,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 { --- -1.7.11.4 - diff --git a/local-lib-1.008009-Append-semicolon-to-setenv.patch b/local-lib-1.008009-Append-semicolon-to-setenv.patch new file mode 100644 index 0000000..6462020 --- /dev/null +++ b/local-lib-1.008009-Append-semicolon-to-setenv.patch @@ -0,0 +1,12 @@ +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/perl-local-lib.spec b/perl-local-lib.spec index 6abae7d..0c20ee0 100644 --- a/perl-local-lib.spec +++ b/perl-local-lib.spec @@ -1,13 +1,13 @@ Name: perl-local-lib Version: 1.008009 -Release: 1%{?dist} +Release: 2%{?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/A/AP/APEIRON/local-lib-%{version}.tar.gz # Allow evaluation in CSH, RHBZ #849609, CPAN RT #60072 -Patch0: local-lib-1.008004-Append-semicolon-to-setenv.patch +Patch0: local-lib-1.008009-Append-semicolon-to-setenv.patch Url: http://search.cpan.org/dist/local-lib Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) BuildArch: noarch @@ -91,6 +91,9 @@ make test %{_sysconfdir}/profile.d/* %changelog +* Fri Apr 19 2013 Iain Arnell 1.008009-2 +- rebase append-semicolon patch + * Fri Mar 08 2013 Iain Arnell 1.008009-1 - update to latest upstream version