- updated to 2.10

- removed obsolete pl.po-update patch

Changed files:
    grep-pl.po-update.patch -> 1.6
    grep.spec -> 1.115

diff --git a/grep-pl.po-update.patch b/grep-pl.po-update.patch
deleted file mode 100644 (file)
index 956f693..0000000
--- a/grep-pl.po-update.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- grep-2.9/po/pl.po.orig     2011-06-21 20:06:12.000000000 +0200
-+++ grep-2.9/po/pl.po  2011-06-26 09:28:08.184563963 +0200
-@@ -1,13 +1,13 @@
- # Polish translation of the GNU grep messages
--# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2005, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
- # This file is distributed under the same license as the grep package.
--# Rafał Maszkowski <rzm@icm.edu.pl>, 1996-2002, 2005, 2007-2010. „”
-+# Rafał Maszkowski <rzm@icm.edu.pl>, 1996-2002, 2005, 2007-2011. „”
- msgid ""
- msgstr ""
--"Project-Id-Version: GNU grep 2.7\n"
-+"Project-Id-Version: GNU grep 2.9\n"
- "Report-Msgid-Bugs-To: bug-grep@gnu.org\n"
- "POT-Creation-Date: 2011-06-21 20:06+0200\n"
--"PO-Revision-Date: 2010-09-21 13:30+0200\n"
-+"PO-Revision-Date: 2011-06-22 21:30+0200\n"
- "Last-Translator: Rafał Maszkowski <rzm@icm.edu.pl>\n"
- "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
- "Language: pl\n"
-@@ -39,9 +39,9 @@
- msgstr "Nieznany błąd systemowy"
- 
- #: lib/getopt.c:547 lib/getopt.c:576
--#, fuzzy, c-format
-+#, c-format
- msgid "%s: option '%s' is ambiguous; possibilities:"
--msgstr "%s: opcja '%s' jest niejednoznaczna\n"
-+msgstr "%s: opcja '%s' jest niejednoznaczna; możliwości:"
- 
- #: lib/getopt.c:624 lib/getopt.c:628
- #, c-format
-@@ -454,11 +454,11 @@
- #. This is a proper name. See the gettext manual, section Names.
- #: src/main.c:59
- msgid "Mike Haertel"
--msgstr "Mike Haertel"
-+msgstr "Mike'a Haertela"
- 
- #: src/main.c:60
- msgid "others, see <http://git.sv.gnu.org/cgit/grep.git/tree/AUTHORS>"
--msgstr "inni, zobacz: http://git.sv.gnu.org/cgit/grep.git/tree/AUTHORS"
-+msgstr "innych, zobacz: http://git.sv.gnu.org/cgit/grep.git/tree/AUTHORS"
- 
- #: src/main.c:418
- msgid "invalid context length argument"
-@@ -613,7 +613,7 @@
- "  -a, --text                równoważne --binary-files=text\n"
- 
- #: src/main.c:1434
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "  -I                        equivalent to --binary-files=without-match\n"
- "  -d, --directories=ACTION  how to handle directories;\n"
-@@ -801,8 +801,4 @@
- #: src/pcresearch.c:159
- #, c-format
- msgid "exceeded PCRE's backtracking limit"
--msgstr ""
--
--#, fuzzy
--#~ msgid "%s: option '%s' is ambiguous\n"
--#~ msgstr "%s: opcja '-W %s' jest niejednoznaczna\n"
-+msgstr "przekroczony limit analizy wstecznej PCRE"

diff --git a/grep.spec b/grep.spec
index c658939b653fe3ce08d50cb42f95a3e9ac804e14..6b614f3332255827062eff3e9700524e7722c40d 100644 (file)
--- a/grep.spec
+++ b/grep.spec
@@ -14,17 +14,16 @@ Summary(ru.UTF-8):  Утилиты поиска по шаблонам GNU grep
 Summary(tr.UTF-8):     Dosyalarda katar arama aracı
 Summary(uk.UTF-8):     Утиліти пошуку по шаблонам GNU grep
 Name:          grep
-Version:       2.9
+Version:       2.10
 Release:       1
 Epoch:         2
 License:       GPL v3+
 Group:         Applications/Text
 Source0:       http://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.xz
-# Source0-md5: 25e41b2aa201104354740961ef36005a
+# Source0-md5: 709915434d09f5db655e5ebd7fd6bb7f
 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
-Patch1:                %{name}-pl.po-update.patch
 URL:           http://www.gnu.org/software/grep/grep.html
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.11
@@ -88,7 +87,6 @@ kullanılır.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %{__rm} po/stamp-po