Browse Source

grep-3.7-1

Tomohiro "Tomo-p" KATO 2 years ago
parent
commit
8598e69915
1 changed files with 20 additions and 9 deletions
  1. 20 9
      g/grep/grep-vl.spec

+ 20 - 9
g/grep/grep-vl.spec

@@ -1,9 +1,9 @@
-Summary: The GNU versions of grep pattern matching utilities.
-Summary(ja): GNU版 grep パターンマッチングユーティリティ
-Name: grep
-Version: 3.6
-Release: 1%{?_dist_release}
-Group: system,accessories
+Summary:        The GNU versions of grep pattern matching utilities.
+Summary(ja):    GNU版 grep パターンマッチングユーティリティ
+Name:           grep
+Version:        3.7
+Release:        1%{?_dist_release}
+Group:          system,accessories
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -13,8 +13,7 @@ Source: https://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
 Source1: colorgrep.sh
 Source2: colorgrep.csh
 Source3: GREP_COLORS
-# upstream ticket 39444
-Patch0: grep-3.33-man-fix-gs.patch
+Source1000: grep-3.7-ja.po
 # upstream ticket 39445
 Patch1: grep-3.33-help-align.patch
 
@@ -48,14 +47,21 @@ utility for searching through text.
 
 %prep
 %setup -q
-%patch0 -p1 -b .man-fix-gs
 %patch1 -p1 -b .help-align
+cp -f %{SOURCE1000} po/ja.po
+
+# workaround for glibc-bug
+# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=50069
+# https://sourceware.org/bugzilla/show_bug.cgi?id=11053
+sed -i -e '/test-regex/d' -e '/test_regex/d' gnulib-tests/gnulib.mk
+autoreconf -ivf
 
 
 %build
 %configure \
 	--without-included-regex
 %__make %{?_smp_mflags}
+%__make -C po ja.gmo
 
 
 %install
@@ -102,6 +108,11 @@ fi
 
 
 %changelog
+* Mon Aug 16 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.7-1
+- new upstream release.
+- dropped Patch0: fixed in upstream.
+- updated ja.po.
+
 * Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6-1
 - new upstream release.