From c3c4805d1de7a629c0cf151a27702eaffcef028a Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 4 Feb 2021 00:44:33 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/grep.git#75261469b1ad2fa0014fd2b33a98e0f0ff55b7a8 --- grep.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/grep.spec b/grep.spec index 9c99b20..7422568 100644 --- a/grep.spec +++ b/grep.spec @@ -1,11 +1,11 @@ Summary: Pattern matching utilities Name: grep Version: 3.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ -URL: http://www.gnu.org/software/grep/ +URL: https://www.gnu.org/software/grep/ -Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz +Source: https://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz Source1: colorgrep.sh Source2: colorgrep.csh Source3: GREP_COLORS @@ -19,6 +19,7 @@ BuildRequires: gcc BuildRequires: pcre-devel >= 3.9-10, texinfo, gettext BuildRequires: autoconf automake glibc-all-langpacks BuildRequires: perl-FileHandle +BuildRequires: make # https://fedorahosted.org/fpc/ticket/174 Provides: bundled(gnulib) # for backward compatibility (rhbz#1540485) @@ -53,7 +54,7 @@ GNU grep is needed by many scripts, so it shall be installed on every system. %make_build %install -%make_install %{?_smp_mflags} +%make_install gzip $RPM_BUILD_ROOT%{_infodir}/grep* rm -f $RPM_BUILD_ROOT%{_infodir}/dir mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d @@ -68,7 +69,6 @@ make check %files -f %{name}.lang %doc AUTHORS THANKS TODO NEWS README -%{!?_licensedir:%global license %%doc} %license COPYING %{_bindir}/* @@ -79,6 +79,9 @@ make check %{_libexecdir}/grepconf.sh %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Nov 9 2020 Jaroslav Škarvada - 3.6-1 - New version Resolves: rhbz#1895797