Hello community,
here is the log from the commit of package ack for openSUSE:Factory checked in
at 2014-09-06 12:18:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ack (Old)
and /work/SRC/openSUSE:Factory/.ack.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ack"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ack/ack.changes 2014-01-23 15:39:28.000000000
+0100
+++ /work/SRC/openSUSE:Factory/.ack.new/ack.changes 2014-09-06
16:53:48.000000000 +0200
@@ -1,0 +2,23 @@
+Thu Sep 4 22:02:47 UTC 2014 - andreas.stie...@gmx.de
+
+- ack 2.14:
+- Enhancements:
+ * ack now ignores JavaScript and CSS source maps
+- Bug fixes:
+ * The -s flag would fail to suppress certain warnings
+ * The -w flag would fail to work properly with regex features
+ such as alternation
+ * The -g flag should now work faster on larger codebases
+- Includes enhancements from 2.13 series:
+ * Add docs for available colors in ack.
+ * --create-ackrc keeps the comments that describe each of the
+ options, and it shows the ack version number
+ * Now ignores Cabal (Haskell) sandboxes
+ * Added filetypes for Jade, Smarty and Stylus
+- updated patches for context changes:
+ * ack-add_spec.patch
+ * ack-ignore-osc.patch
+- removed patches:
+ * ack-fix_smartcase_test_for_old_perl.patch
+
+-------------------------------------------------------------------
Old:
----
ack-2.12.tar.gz
ack-fix_smartcase_test_for_old_perl.patch
New:
----
ack-2.14.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ack.spec ++++++
--- /var/tmp/diff_new_pack.LAIy1v/_old 2014-09-06 16:53:49.000000000 +0200
+++ /var/tmp/diff_new_pack.LAIy1v/_new 2014-09-06 16:53:49.000000000 +0200
@@ -1,4 +1,3 @@
-# vim: set ts=4 sw=4 et:
#
# spec file for package ack
#
@@ -17,42 +16,38 @@
#
-%{!?perl_make_install: %global perl_make_install make DESTDIR=$RPM_BUILD_ROOT
install_vendor}
-
+%define run_tests 0%{?suse_version} >= 1210
%if 0%{?suse_version} >= 1100 || 0%{?fedora} >= 13
%define with_pod 1
%else
%define with_pod 0
%endif
-
-%define run_tests 0%{?suse_version} >= 1210
-
Name: ack
-Version: 2.12
+Version: 2.14
Release: 0
Summary: Grep-Like Text Finder
License: Artistic-2.0
Group: Productivity/Text/Utilities
+Url: http://beyondgrep.com/
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://beyondgrep.com/
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: perl
BuildRequires: make
BuildRequires: perl >= 5.8.8
BuildRequires: perl(File::Next) >= 1.10
-%if %run_tests
+Requires: perl
+Requires: perl-App-Ack = %{version}-%{release}
+Requires: perl-base = %{perl_version}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
+%{!?perl_make_install: %global perl_make_install make DESTDIR=%{buildroot}
install_vendor}
+%if %{run_tests}
BuildRequires: perl(File::Temp) >= 0.19
BuildRequires: perl(IO::Pty)
%endif
-%if %with_pod
+%if %{with_pod}
BuildRequires: perl(Test::Pod) >= 1.14
%endif
-BuildArch: noarch
-Requires: perl-App-Ack = %{version}-%{release}
-Requires: perl-base = %{perl_version}
%description
ack is a grep-like tool tailored to working with large trees of source code.
@@ -60,19 +55,16 @@
%package -n perl-App-Ack
Summary: Grep-Like Text Finder Perl Module
Group: Development/Libraries/Perl
-Requires: perl-base = %{perl_version}
Requires: perl(File::Next) >= 1.10
+Requires: perl-base = %{perl_version}
%description -n perl-App-Ack
App::Ack is a grep-like tool tailored to working with large trees of source
code.
%prep
-%setup -q -n "ack-%{version}"
+%setup -q
%patch1 -p1
-%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1000 || 0%{?rhel_version} > 0
&& 0%{?rhel_version} < 500
-%patch2
-%endif
%patch3 -p1
%build
@@ -91,7 +83,7 @@
# remove .packlist file
rm -rf "%{buildroot}%{perl_vendorarch}/auto/ack"
-rm -f "%{buildroot}/var/adm/perl-modules/ack"
+rm -f "%{buildroot}%{_localstatedir}/adm/perl-modules/ack"
install -d rpmdoc_ack
for f in Changes README.md LICENSE.md; do
@@ -99,8 +91,8 @@
done
%check
-%if %run_tests
-make test
+%if %{run_tests}
+make test %{?_smp_mflags}
%endif
%files
++++++ ack-2.12.tar.gz -> ack-2.14.tar.gz ++++++
++++ 4149 lines of diff (skipped)
++++++ ack-add_spec.patch ++++++
--- /var/tmp/diff_new_pack.LAIy1v/_old 2014-09-06 16:53:49.000000000 +0200
+++ /var/tmp/diff_new_pack.LAIy1v/_new 2014-09-06 16:53:49.000000000 +0200
@@ -1,14 +1,26 @@
-Index: ack-2.04/ConfigDefault.pm
+From: Andreas Stieger <andreas.stie...@gmx.de>
+Date: Thu, 04 Sep 2014 23:09:09 +0100
+Subject: Add RPM/.spec type
+Upstream: Submitted
+References: https://github.com/petdance/ack2/pull/490
+
+Add rpm/.spec to known file types
+
+---
+ ConfigDefault.pm | 3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: ack-2.14/ConfigDefault.pm
===================================================================
---- ack-2.04.orig/ConfigDefault.pm
-+++ ack-2.04/ConfigDefault.pm
-@@ -236,6 +236,9 @@ sub _options_block {
- # R http://www.r-project.org/
- --type-add=rr:ext:R
+--- ack-2.14.orig/ConfigDefault.pm 2014-09-04 22:19:55.000000000 +0100
++++ ack-2.14/ConfigDefault.pm 2014-09-04 22:20:35.000000000 +0100
+@@ -342,6 +342,9 @@ sub _options_block {
+ # http://docutils.sourceforge.net/rst.html
+ --type-add=rst:ext:rst
+# RPM
-+--type-add=rpm:ext:rpm,spec
++--type-add=rpm:ext:spec
+
- # Ruby http://www.ruby-lang.org/
+ # Ruby
+ # http://www.ruby-lang.org/
--type-add=ruby:ext:rb,rhtml,rjs,rxml,erb,rake,spec
- --type-add=ruby:is:Rakefile
++++++ ack-ignore-osc.patch ++++++
--- /var/tmp/diff_new_pack.LAIy1v/_old 2014-09-06 16:53:49.000000000 +0200
+++ /var/tmp/diff_new_pack.LAIy1v/_new 2014-09-06 16:53:49.000000000 +0200
@@ -1,30 +1,37 @@
+From: Andreas Stieger <andreas.stie...@gmx.de>
+Date: Thu, 04 Sep 2014 23:09:09 +0100
+Subject: Ignore .osc
+Upstream: No
+
+Ignore .osc
+
---
ConfigDefault.pm | 3 +++
t/ack-dump.t | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
-Index: ack-2.12/ConfigDefault.pm
+Index: ack-2.14/ConfigDefault.pm
===================================================================
---- ack-2.12.orig/ConfigDefault.pm 2013-11-30 18:34:00.000000000 +0000
-+++ ack-2.12/ConfigDefault.pm 2014-01-17 22:56:49.000000000 +0000
-@@ -47,6 +47,9 @@ sub _options_block {
- # Mercurial
+--- ack-2.14.orig/ConfigDefault.pm 2014-09-04 22:13:22.000000000 +0100
++++ ack-2.14/ConfigDefault.pm 2014-09-04 22:13:31.000000000 +0100
+@@ -58,6 +58,9 @@ sub _options_block {
+ # http://mercurial.selenic.com/
--ignore-directory=is:.hg
+# openSUSE Commander
+--ignore-directory=is:.osc
+
# quilt
+ # http://directory.fsf.org/wiki/Quilt
--ignore-directory=is:.pc
-
-Index: ack-2.12/t/ack-dump.t
+Index: ack-2.14/t/ack-dump.t
===================================================================
---- ack-2.12.orig/t/ack-dump.t 2013-11-30 18:34:00.000000000 +0000
-+++ ack-2.12/t/ack-dump.t 2014-01-17 22:56:35.000000000 +0000
-@@ -32,5 +32,5 @@ DUMP: {
+--- ack-2.14.orig/t/ack-dump.t 2014-09-04 22:13:31.000000000 +0100
++++ ack-2.14/t/ack-dump.t 2014-09-04 22:14:07.000000000 +0100
+@@ -31,5 +31,5 @@ DUMP: {
is( scalar @perl, 2, 'Two specs for Perl' );
my @ignore_dir = grep { /ignore-dir/ } @results;
-- is( scalar @ignore_dir, 23, 'Twenty-three specs for ignoring directories'
);
-+ is( scalar @ignore_dir, 24, 'Twenty-four specs for ignoring directories'
);
+- is( scalar @ignore_dir, 24, 'Twenty-four specs for ignoring directories'
);
++ is( scalar @ignore_dir, 25, 'Twenty-five specs for ignoring directories'
);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
