[packages/grep] up to 3.12

atler atler at pld-linux.org
Sun Apr 13 13:24:38 CEST 2025


commit 5577cc0c33e38d4cb874504d741b54393a296460
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Apr 13 12:32:27 2025 +0200

    up to 3.12

 grep-dirfd.patch        | 21 ---------------------
 grep-pl.po-update.patch |  2 +-
 grep.spec               |  9 +++------
 3 files changed, 4 insertions(+), 28 deletions(-)
---
diff --git a/grep.spec b/grep.spec
index ecca087..3a97af0 100644
--- a/grep.spec
+++ b/grep.spec
@@ -14,20 +14,18 @@ Summary(ru.UTF-8):	Утилиты поиска по шаблонам GNU grep
 Summary(tr.UTF-8):	Dosyalarda katar arama aracı
 Summary(uk.UTF-8):	Утиліти пошуку по шаблонам GNU grep
 Name:		grep
-Version:	3.11
-Release:	2
+Version:	3.12
+Release:	1
 Epoch:		2
 License:	GPL v3+
 Group:		Applications/Text
 Source0:	https://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.xz
-# Source0-md5:	7c9bbd74492131245f7cdb291fa142c0
+# Source0-md5:	5d9301ed9d209c4a88c8d3a6fd08b9ac
 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
 Patch2:		disable-unstable-test.patch
-# check and drop with grep 3.12+
-Patch3:         %{name}-dirfd.patch
 URL:		http://www.gnu.org/software/grep/grep.html
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake >= 1:1.12
@@ -94,7 +92,6 @@ kullanılır.
 %patch -P0 -p1
 %patch -P1 -p1
 %patch -P2 -p1
-%patch -P3 -p1
 
 %{__rm} po/stamp-po
 
diff --git a/grep-dirfd.patch b/grep-dirfd.patch
deleted file mode 100644
index e09bc10..0000000
--- a/grep-dirfd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fixes gnulib "Operation not supported" error when grepping -r
- directories with more than 100000 files.
- The bug is already fixed in the upstream development branch.
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1041588
-Author: Vincent Lefevre <vincent at vinc17.net>
-Forwarded: not-needed
-
-diff -Naurd grep-3.11-orig/m4/dirfd.m4 grep-3.11/m4/dirfd.m4
---- grep-3.11~/m4/dirfd.m4	2023-04-29 11:03:00.000000000 +0200
-+++ grep-3.11/m4/dirfd.m4	2023-07-21 19:40:41.345044696 +0200
-@@ -40,10 +40,6 @@
-     HAVE_DIRFD=0
-   else
-     HAVE_DIRFD=1
--    dnl Replace only if the system declares dirfd already.
--    if test $ac_cv_have_decl_dirfd = yes; then
--      REPLACE_DIRFD=1
--    fi
-     dnl Replace dirfd() on native Windows, to support fdopendir().
-     AC_REQUIRE([gl_DIRENT_DIR])
-     if test $DIR_HAS_FD_MEMBER = 0; then
diff --git a/grep-pl.po-update.patch b/grep-pl.po-update.patch
index 8e761d2..48f7e32 100644
--- a/grep-pl.po-update.patch
+++ b/grep-pl.po-update.patch
@@ -5,7 +5,7 @@ diff -urNp -x '*.orig' grep-3.6.org/po/pl.po grep-3.6/po/pl.po
  msgstr ""
  "  -o, --only-matching       pokazanie tylko niepustych części linii, które\n"
  "                              pasują\n"
--"  -q, --quiet, --silent     wyłączenie wypisywanie wyniku\n"
+-"  -q, --quiet, --silent     wyłączenie wypisywania wyniku\n"
 +"  -q, --quiet, --silent     wyłączenie zwykłego wyjścia\n"
  "      --binary-files=TYP    założenie, że pliki binarne są typu TYP\n"
  "                            TYP to „binary”, „text” lub „without-match”.\n"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grep.git/commitdiff/5577cc0c33e38d4cb874504d741b54393a296460



More information about the pld-cvs-commit mailing list