diff --git a/macros.mingw32 b/macros.mingw32 index 6caf0a2..1f5d360 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -50,7 +50,7 @@ %mingw32_windmc %{mingw32_target}-windmc %mingw32_windres %{mingw32_target}-windres -%mingw32_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \ +%mingw32_env unset $(/usr/bin/env | grep -E '^(\w+)=(.*)$' | grep -Evw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \ if test -z "$PATH_ORIG" ; then \ PATH_ORIG="$PATH"; export PATH_ORIG; \ fi; \ diff --git a/macros.mingw64 b/macros.mingw64 index bf28141..d5c16cc 100644 --- a/macros.mingw64 +++ b/macros.mingw64 @@ -50,7 +50,7 @@ %mingw64_windmc %{mingw64_target}-windmc %mingw64_windres %{mingw64_target}-windres -%mingw64_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \ +%mingw64_env unset $(/usr/bin/env | grep -E '^(\w+)=(.*)$' | grep -Evw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \ if test -z "$PATH_ORIG" ; then \ PATH_ORIG="$PATH"; export PATH_ORIG; \ fi; \ diff --git a/macros.ucrt64 b/macros.ucrt64 index acbde9e..28e13dc 100644 --- a/macros.ucrt64 +++ b/macros.ucrt64 @@ -49,7 +49,7 @@ %ucrt64_windmc %{ucrt64_target}-windmc %ucrt64_windres %{ucrt64_target}-windres -%ucrt64_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \ +%ucrt64_env unset $(/usr/bin/env | grep -E '^(\w+)=(.*)$' | grep -Evw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \ if test -z "$PATH_ORIG" ; then \ PATH_ORIG="$PATH"; export PATH_ORIG; \ fi; \ diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 732c90f..fe483e9 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -7,7 +7,7 @@ Name: mingw-filesystem Version: 141 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPLv2+ @@ -245,7 +245,7 @@ cat %{SOURCE101} | grep -v "^#" | grep -v "^$" | while read loc ; do fi # If the locale is not official and not special, skip it if [ -z "$special" ]; then - egrep -q "[[:space:]]${locale%%_*}[[:space:]]" %{buildroot}/iso_639.tab || continue + grep -Eq "[[:space:]]${locale%%_*}[[:space:]]" %{buildroot}/iso_639.tab || continue fi echo "%lang(${locale}) %{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw32 echo "%lang(${locale}) %{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw64 @@ -363,6 +363,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Tue Sep 27 2022 Sandro Mani - 141-2 +- Replace egrep with grep -E + * Sat Jul 30 2022 Sandro Mani - 141-1 - Revert unsetting _PREFIX diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh index 317749a..a7c6a98 100755 --- a/mingw-find-debuginfo.sh +++ b/mingw-find-debuginfo.sh @@ -12,7 +12,7 @@ shift for f in `find $RPM_BUILD_ROOT -type f -name "*.exe" -or -name "*.dll" -or -name "*.pyd"` do - case $(mingw-objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in + case $(mingw-objdump -h $f 2>/dev/null | grep -Eo '(debug[\.a-z_]*|gnu.version)') in *debuglink*) continue ;; *debug*) ;; *gnu.version*)