From 146d4fe95344a434aeb66cf470a3c6a425448245502f9df05c5a38ecc24b5957 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sun, 27 Oct 2013 03:27:57 +0000 Subject: [PATCH] Accepting request 203683 from home:AndreasStieger:branches:utilities update to 2.10, including changes from devel:languages:perl OBS-URL: https://build.opensuse.org/request/show/203683 OBS-URL: https://build.opensuse.org/package/show/utilities/ack?expand=0&rev=16 --- ack-2.04.tar.gz | 3 --- ack-2.10.tar.gz | 3 +++ ack-ignore-osc.patch | 23 ++++++++++++++--------- ack.changes | 44 ++++++++++++++++++++++++++++++++++++++++++++ ack.spec | 22 ++++++++++++---------- 5 files changed, 73 insertions(+), 22 deletions(-) delete mode 100644 ack-2.04.tar.gz create mode 100644 ack-2.10.tar.gz diff --git a/ack-2.04.tar.gz b/ack-2.04.tar.gz deleted file mode 100644 index 41aaf48..0000000 --- a/ack-2.04.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c58d72f61eec4e6e57a418f3a63c6735eafad20d6c319279fe33edc41ef9ac4 -size 209885 diff --git a/ack-2.10.tar.gz b/ack-2.10.tar.gz new file mode 100644 index 0000000..2dc22cf --- /dev/null +++ b/ack-2.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c14ba1c49e172013f4097328b5cdda595fe02e69af7abaa045e9f9f23b27863c +size 215820 diff --git a/ack-ignore-osc.patch b/ack-ignore-osc.patch index a89fb66..e15b202 100644 --- a/ack-ignore-osc.patch +++ b/ack-ignore-osc.patch @@ -1,8 +1,13 @@ -Index: ack-2.04/ConfigDefault.pm +--- + ConfigDefault.pm | 3 +++ + t/ack-dump.t | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +Index: ack-2.10/ConfigDefault.pm =================================================================== ---- ack-2.04.orig/ConfigDefault.pm -+++ ack-2.04/ConfigDefault.pm -@@ -46,6 +46,9 @@ sub _options_block { +--- ack-2.10.orig/ConfigDefault.pm 2013-09-24 22:35:57.000000000 +0100 ++++ ack-2.10/ConfigDefault.pm 2013-10-17 20:18:20.000000000 +0100 +@@ -47,6 +47,9 @@ sub _options_block { # Mercurial --ignore-directory=is:.hg @@ -12,14 +17,14 @@ Index: ack-2.04/ConfigDefault.pm # quilt --ignore-directory=is:.pc -Index: ack-2.04/t/ack-dump.t +Index: ack-2.10/t/ack-dump.t =================================================================== ---- ack-2.04.orig/t/ack-dump.t -+++ ack-2.04/t/ack-dump.t +--- ack-2.10.orig/t/ack-dump.t 2013-09-24 22:35:57.000000000 +0100 ++++ ack-2.10/t/ack-dump.t 2013-10-17 20:18:58.000000000 +0100 @@ -32,5 +32,5 @@ DUMP: { is( scalar @perl, 2, 'Two specs for Perl' ); my @ignore_dir = grep { /ignore-dir/ } @results; -- is( scalar @ignore_dir, 20, 'Twenty specs for ignoring directories' ); -+ is( scalar @ignore_dir, 21, 'Twenty specs for ignoring directories' ); +- is( scalar @ignore_dir, 22, 'Twenty-two specs for ignoring directories' ); ++ is( scalar @ignore_dir, 23, 'Twenty-three specs for ignoring directories' ); } diff --git a/ack.changes b/ack.changes index c890388..692bf2b 100644 --- a/ack.changes +++ b/ack.changes @@ -1,4 +1,48 @@ ------------------------------------------------------------------- +Thu Oct 17 21:03:44 UTC 2013 - andreas.stieger@gmx.de + +- update to 2.10: + * Add --perltest for *.t files + * Added Matlab support + * More compatibility fixes for Perl 5.8.8. +- includes changes from 2.08 + * ack now ignores CMake's build/cache directories by default + * Add shebang matching for --lua files + * Add documentation for --ackrc + * Add Elixir filetype + * Add --cathy option + * Add some helpful debugging tips when an invalid option is found + * Ignore PDF files by default, because Perl will detect them as text + * Ignore .gif, .jpg, .jpeg and .png files. They won't normally be + selected, but this is an optimization so that ack doesn't have to + open them to know + * Ack's colorizing of output would get confused with multiple sets + of parentheses + * Ack would get confused when trying to colorize the output in + DOS-format files +- includes changes from 2.05_01 + * We now ignore the node_modules directories created by npm + * --pager without an argument implies --pager=$PAGER + * --perl now recognizes Plack-style .psgi files + * Added filetypes for Coffescript, JSON, LESS, and Sass. + * Command-line options now override options set in ackrc files + * ACK_PAGER and ACK_PAGER_COLOR now work as advertised. + * Fix a bug resulting in uninitialized variable warnings when more + than one capture group was specified in the search pattern + * Make sure ack is happy to build and test under cron and other + console-less environments. +- packaging changes: + * run more rests with IO::Pty + * refresh ack-ignore-osc.patch for upstream changes + * update project URL +- port changes from devel:languages:perl ack by daxim@cpan.org: + * correct metadata: licence, CPAN download, homepage + * unset forced prefix - let Perl configuration and toolchain + determine the prefix/install_base which will DTRT + * bash completion is gone, remove dead code + +------------------------------------------------------------------- + Thu Aug 15 13:07:09 UTC 2013 - idonmez@suse.com - Add perl-File-Next runtime dependency diff --git a/ack.spec b/ack.spec index afc3ade..953a5ca 100644 --- a/ack.spec +++ b/ack.spec @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + %{!?perl_make_install: %global perl_make_install make DESTDIR=$RPM_BUILD_ROOT install_vendor} %if 0%{?suse_version} >= 1100 || 0%{?fedora} >= 13 @@ -24,23 +26,24 @@ %endif Name: ack -Version: 2.04 +Version: 2.10 Release: 0 Summary: Grep-Like Text Finder -License: Artistic-1.0 or GPL-1.0+ +License: Artistic-2.0 Group: Productivity/Text/Utilities -Source: http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/ack-%{version}.tar.gz +Source: http://cpan.metacpan.org/authors/id/P/PE/PETDANCE/ack-%{version}.tar.gz Patch1: ack-ignore-osc.patch Patch2: ack-fix_smartcase_test_for_old_perl.patch Patch3: ack-add_spec.patch -Url: http://petdance.com/ack/ +Url: http://beyondgrep.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: perl BuildRequires: make -BuildRequires: perl -BuildRequires: perl-File-Next +BuildRequires: perl >= 5.8.8 +BuildRequires: perl(File::Next) >= 1.10 +BuildRequires: perl(IO::Pty) %if %with_pod -BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Pod) >= 1.14 %endif BuildArch: noarch Requires: perl-App-Ack = %{version}-%{release} @@ -52,8 +55,8 @@ ack is a grep-like tool tailored to working with large trees of source code. %package -n perl-App-Ack Summary: Grep-Like Text Finder Perl Module Group: Development/Libraries/Perl -Requires: perl-File-Next Requires: perl-base = %{perl_version} +Requires: perl(File::Next) >= 1.10 %description -n perl-App-Ack App::Ack is a grep-like tool tailored to working with large trees of source @@ -68,7 +71,7 @@ code. %patch3 -p1 %build -perl Makefile.PL PREFIX="%{_prefix}" +perl Makefile.PL make %{?_smp_mflags} %install @@ -96,7 +99,6 @@ make test %files %defattr(-,root,root) %doc rpmdoc_ack/* -#config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}.sh %{_bindir}/ack %doc %{_mandir}/man1/ack.1%{ext_man}