diff --git a/.files b/.files
index 651f6a2..b3a4e42 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 534f0cd..1fb5206 100644
--- a/.rev
+++ b/.rev
@@ -224,4 +224,12 @@
755264
+
+ c4558280b5760d7552ba3319b5de9f26
+ 3.3.1
+
+ dimstar_suse
+
+ 767920
+
diff --git a/ack-add_spec.patch b/ack-add_spec.patch
index 90ec985..eeba812 100644
--- a/ack-add_spec.patch
+++ b/ack-add_spec.patch
@@ -7,15 +7,11 @@ 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/lib/App/Ack/ConfigDefault.pm
-===================================================================
---- ack-2.14.orig/lib/App/Ack/ConfigDefault.pm 2014-09-04 22:19:55.000000000 +0100
-+++ ack-2.14/lib/App/Ack/ConfigDefault.pm 2014-09-04 22:20:35.000000000 +0100
-@@ -342,6 +342,9 @@ sub _options_block {
- # http://docutils.sourceforge.net/rst.html
+diff -Pdru ack-v3.3.1.orig/lib/App/Ack/ConfigDefault.pm ack-v3.3.1/lib/App/Ack/ConfigDefault.pm
+--- ack-v3.3.1.orig/lib/App/Ack/ConfigDefault.pm 2020-01-22 14:49:59.116748125 +0100
++++ ack-v3.3.1/lib/App/Ack/ConfigDefault.pm 2020-01-22 14:51:46.072490906 +0100
+@@ -392,6 +392,9 @@
+ # https://docutils.sourceforge.io/rst.html
--type-add=rst:ext:rst
+# RPM
diff --git a/ack-ignore-osc.patch b/ack-ignore-osc.patch
index 34c195e..ae8ace4 100644
--- a/ack-ignore-osc.patch
+++ b/ack-ignore-osc.patch
@@ -6,15 +6,10 @@ Upstream: No
Ignore .osc
---
- ConfigDefault.pm | 3 +++
- t/ack-dump.t | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-Index: ack-v3.0.2/lib/App/Ack/ConfigDefault.pm
-===================================================================
---- ack-v3.0.2.orig/lib/App/Ack/ConfigDefault.pm
-+++ ack-v3.0.2/lib/App/Ack/ConfigDefault.pm
-@@ -70,6 +70,9 @@ sub _options_block {
+diff -Pdru ack-v3.3.1.orig/lib/App/Ack/ConfigDefault.pm ack-v3.3.1/lib/App/Ack/ConfigDefault.pm
+--- ack-v3.3.1.orig/lib/App/Ack/ConfigDefault.pm 2020-01-13 20:18:17.000000000 +0100
++++ ack-v3.3.1/lib/App/Ack/ConfigDefault.pm 2020-01-22 14:32:56.451135251 +0100
+@@ -70,6 +70,9 @@
# https://www.mercurial-scm.org/
--ignore-directory=is:.hg
@@ -24,14 +19,15 @@ Index: ack-v3.0.2/lib/App/Ack/ConfigDefault.pm
# Quilt
# https://directory.fsf.org/wiki/Quilt
--ignore-directory=is:.pc
-Index: ack-v3.0.2/t/ack-dump.t
-===================================================================
---- ack-v3.0.2.orig/t/ack-dump.t
-+++ ack-v3.0.2/t/ack-dump.t
-@@ -29,5 +29,5 @@ DUMP: {
+diff -Pdru ack-v3.3.1.orig/t/internals/ack-dump.t ack-v3.3.1/t/internals/ack-dump.t
+--- ack-v3.3.1.orig/t/internals/ack-dump.t 2020-01-13 20:18:17.000000000 +0100
++++ ack-v3.3.1/t/internals/ack-dump.t 2020-01-22 14:39:05.934290071 +0100
+@@ -29,7 +29,7 @@
is( scalar @perl, 2, 'Two specs for Perl' );
my @ignore_dir = grep { /ignore-dir/ } @results;
-- is( scalar @ignore_dir, 24, 'Twenty-four specs for ignoring directories' );
-+ is( scalar @ignore_dir, 25, 'Twenty-five specs for ignoring directories' );
+- is( scalar @ignore_dir, 27, 'Twenty-seven specs for ignoring directories' );
++ is( scalar @ignore_dir, 28, 'Twenty-eight specs for ignoring directories' );
}
+
+ exit 0;
diff --git a/ack-v3.2.0.tar.gz b/ack-v3.2.0.tar.gz
deleted file mode 120000
index d71d9c2..0000000
--- a/ack-v3.2.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreic2a4eviuj4djwfmiwtxa7ohxoqjnlth6lmoypsc3ktsgj7fbg3am
\ No newline at end of file
diff --git a/ack-v3.3.1.tar.gz b/ack-v3.3.1.tar.gz
new file mode 120000
index 0000000..4a4fe17
--- /dev/null
+++ b/ack-v3.3.1.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafkreifohnrajhyeme4uocjt4rqpeq2prapvek3lfqvuvfgnmjh66t6vre
\ No newline at end of file
diff --git a/ack.changes b/ack.changes
index 42951da..59f9ded 100644
--- a/ack.changes
+++ b/ack.changes
@@ -1,4 +1,30 @@
-------------------------------------------------------------------
+Wed Jan 22 14:02:54 UTC 2020 - Martin Rey
+
+- ack 3.3.1:
+ * Fix some regexes that would be shown as invalid when used with
+ the -Q option. Since the -Q tells ack to treat the regex as a
+ literal, this shouldn't be possible (GH #294)
+
+- includes changes from 3.3.0:
+ * Improve error message when the regex passed is invalid
+ * Add new file and directory exclusions
+ * Reorganize --help menu
+ * Output message when using --show-types without -f or -g if it
+ will have no effect
+ * Improve error message when ack gets passed two options that
+ can't be used together
+ * Fix the behavior of --break and --heading
+ * Warn when option pairs don't make sense to use together
+ * Fix required minimum version of Getopt::Long module (GH #287)
+ * Line number and filename separators in --passthru mode now work
+ the same as in context (-A/-B/-C) mode (GH #291)
+
+- Rebase patches:
+ * ack-add_spec.patch
+ * ack-ignore-osc.patch
+
+-------------------------------------------------------------------
Sat Nov 23 11:32:01 UTC 2019 - Andreas Stieger
- ack 3.2.0:
diff --git a/ack.spec b/ack.spec
index 246c8a8..06ace35 100644
--- a/ack.spec
+++ b/ack.spec
@@ -24,7 +24,7 @@
%endif
%{!?perl_make_install: %global perl_make_install make DESTDIR=%{buildroot} install_vendor}
Name: ack
-Version: 3.2.0
+Version: 3.3.1
Release: 0
Summary: Grep-Like Text Finder
License: Artistic-2.0