From 7efced9f84b02514bf70fd861625172103aa2df6 Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Sat, 3 Oct 2020 20:00:36 +0200
Subject: [PATCH] up to 3.5

---
 disable-unstable-test.patch | 2 +-
 grep-pl.po-update.patch     | 9 ---------
 grep.spec                   | 4 ++--
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/disable-unstable-test.patch b/disable-unstable-test.patch
index bd9a62b..a3b8139 100644
--- a/disable-unstable-test.patch
+++ b/disable-unstable-test.patch
@@ -15,6 +15,6 @@
    kwset-abuse					\
    long-line-vs-2GiB-read			\
 -  long-pattern-perf				\
+   many-regex-performance			\
    match-lines					\
    max-count-overread				\
-   max-count-vs-context				\
diff --git a/grep-pl.po-update.patch b/grep-pl.po-update.patch
index d056b80..0bc3f6b 100644
--- a/grep-pl.po-update.patch
+++ b/grep-pl.po-update.patch
@@ -9,12 +9,3 @@
  "      --binary-files=TYP    założenie, że pliki binarne są typu TYP\n"
  "                            TYP to „binary”, „text” lub „without-match”.\n"
  "  -a, --text                równoważne --binary-files=text\n"
-@@ -573,7 +573,7 @@
- "                              symbolicznymi\n"
- 
- #: src/grep.c:1970
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "      --include=GLOB        search only files that match GLOB (a file "
- "pattern)\n"
diff --git a/grep.spec b/grep.spec
index 0b1821c..643b7f9 100644
--- a/grep.spec
+++ b/grep.spec
@@ -14,13 +14,13 @@ Summary(ru.UTF-8):	Утилиты поиска по шаблонам GNU grep
 Summary(tr.UTF-8):	Dosyalarda katar arama aracı
 Summary(uk.UTF-8):	Утиліти пошуку по шаблонам GNU grep
 Name:		grep
-Version:	3.4
+Version:	3.5
 Release:	1
 Epoch:		2
 License:	GPL v3+
 Group:		Applications/Text
 Source0:	https://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.xz
-# Source0-md5:	111b117d22d6a7d049d6ae7505e9c4d2
+# Source0-md5:	76c59a77281685b3f9e1417411189ce9
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	1b5e726d0bee53e898531de4a76ad290
 Patch0:		%{name}-info.patch
-- 
2.44.0