- updated to 2.5.4

Changed files:
    grep-info.patch -> 1.4
    grep.spec -> 1.104

diff --git a/grep-info.patch b/grep-info.patch
index 2139e826369d8899aa9931c12650e22537069649..f188554ac1c5c632c2f9be4c0c5fb02e26f1e6fc 100644 (file)
--- a/grep-info.patch
+++ b/grep-info.patch
@@ -1,13 +1,14 @@
---- grep-2.5.3/doc/grep.texi.orig      2006-08-19 00:00:31.000000000 +0200
-+++ grep-2.5.3/doc/grep.texi   2007-08-28 19:31:10.920506748 +0200
-@@ -25,8 +25,9 @@
- @syncodeindex vr fn
+--- grep-2.5.4/doc/grep.texi~  2009-02-11 22:18:48.574650826 +0100
++++ grep-2.5.4/doc/grep.texi   2009-02-11 22:19:50.404383538 +0100
+@@ -29,9 +29,9 @@
+ @end quotation
+ @end copying
  
- @ifinfo
+-@dircategory Text creation and manipulation
 +@dircategory File utilities:
  @direntry
--* grep: (grep).                 print lines matching a pattern.
-+* grep: (grep).                               print lines matching a pattern
+-* grep: (grep).                 Print lines matching a pattern.
++* grep: (grep).                               Print lines matching a pattern
  @end direntry
- This file documents @command{grep}, a pattern matching engine.
  
+ @titlepage

diff --git a/grep.spec b/grep.spec
index 1af031bb1d6809f4baa0286d98d7f39fb2e65bef..9572b55378a01a53354b31267e84c989de6bbe4f 100644 (file)
--- a/grep.spec
+++ b/grep.spec
@@ -13,23 +13,21 @@ Summary(ru.UTF-8):  Утилиты поиска по шаблонам GNU grep
 Summary(tr.UTF-8):     Dosyalarda katar arama aracı
 Summary(uk.UTF-8):     Утиліти пошуку по шаблонам GNU grep
 Name:          grep
-Version:       2.5.3
-Release:       4
+Version:       2.5.4
+Release:       1
 Epoch:         2
 License:       GPL v3+
 Group:         Applications/Text
 Source0:       http://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.gz
-# Source0-md5: 4f371f25f413f700fb1984b878421f9d
+# Source0-md5: 92258031d98d4f12dfc6a6d24057e672
 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}-locale-names.patch
-Patch2:                %{name}-pl.po-update.patch
-Patch3:                %{name}-strerror.patch
+Patch1:                %{name}-strerror.patch
 # from debian; very important for multibytes locale; see https://savannah.gnu.org/bugs/?14472
-Patch4:                %{name}-egf-speedup.patch
-Patch5:                %{name}-dfa-optional.patch
-Patch6:                %{name}-match_icase.patch
+Patch2:                %{name}-egf-speedup.patch
+Patch3:                %{name}-dfa-optional.patch
+Patch4:                %{name}-match_icase.patch
 URL:           http://www.gnu.org/software/grep/grep.html
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
@@ -94,11 +92,9 @@ kullanılır.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch2 -p0
+%patch3 -p0
 %patch4 -p0
-%patch5 -p0
-%patch6 -p0
 
 # outdated, there is already nb.po
 rm -f po/no.po