From 7c5558bbc77e9af061493266684798edf523769c Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Tue, 30 Jul 2024 21:15:48 +0800 Subject: [PATCH] fix lang file declaration (cherry picked from commit ed0950e9a2018e37588db20b3bd6eeccc2dedce9) --- grep.spec | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/grep.spec b/grep.spec index 01f8867..4cb0f94 100644 --- a/grep.spec +++ b/grep.spec @@ -1,9 +1,9 @@ Name: grep Version: 3.11 -Release: 2 +Release: 3 Summary: A string search utility -License: GPLv3+ -URL: http://www.gnu.org/software/grep/ +License: GPL-3.0-or-later AND LGPL-3.0-or-later AND LGPL-2.1-or-later AND GPL-2.0-or-later AND LGPL-2.0-or-later AND GFDL-1.3-no-invariants-or-later +URL: https://www.gnu.org/software/grep Source0: https://ftp.gnu.org/gnu/grep/grep-%{version}.tar.xz Source1: color_grep.sh Source2: colorgrep.csh @@ -11,7 +11,7 @@ Source3: grepconf.sh Patch0001: fix-grep-m2-pattern.patch -BuildRequires: gcc pcre2-devel texinfo gettext libsigsegv-devel automake +BuildRequires: gcc pcre2-devel texinfo gettext automake Provides: /bin/egrep /bin/fgrep /bin/grep bundled(gnulib) %description @@ -34,27 +34,25 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -pm 644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -Dpm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libexecdir}/grepconf.sh -%pre -%preun -%post -%postun +%find_lang %{name} %check -make check +%make_build check -%files -%{_datadir}/locale/* +%files -f %{name}.lang %config(noreplace) %{_sysconfdir}/profile.d/color_grep.sh %config(noreplace) %{_sysconfdir}/profile.d/colorgrep.csh -%doc NEWS README THANKS TODO -%license COPYING AUTHORS +%doc NEWS README THANKS TODO AUTHORS +%license COPYING %{_bindir}/*grep %{_libexecdir}/grepconf.sh -%{_infodir}/grep.info.gz -%{_mandir}/man1/*grep.1.gz - +%{_infodir}/grep.info* +%{_mandir}/man1/*grep.1* %changelog +* Tue Jul 30 2024 Funda Wang - 3.11-3 +- fix lang file declaration + * Mon Jun 03 2024 wangziliang - 3.11-2 - fix grep -m2 pattern bug -- Gitee