up to 3.5

diff --git a/disable-unstable-test.patch b/disable-unstable-test.patch
index bd9a62b2dab6b12035bb75bd35f2a4cc02726813..a3b81397d794c6820b8ac6ff7cea8b06b4151219 100644 (file)
--- 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 d056b800b5480b1beee010bcb54b3e5d172ac1f4..0bc3f6bc5fdedf18930e48ff0c0f8be6b18f6414 100644 (file)
--- 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 0b1821cfb79d3076666c52055aa5504cb8b22d37..643b7f931339409ee659e27db2c58cc1c7c63f94 100644 (file)
--- 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