rpms/mingw-filesystem
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Replace egrep with grep -E

Browse Source
This commit is contained in:
Sandro Mani 2022-10-06 08:51:53 +02:00
parent 28d3d2b73d
commit 2bf8319605
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macros.mingw32
View File

@ -50,7 +50,7 @@
%mingw32_windmc %{mingw32_target}-windmc %mingw32_windmc %{mingw32_target}-windmc
%mingw32_windres %{mingw32_target}-windres %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 \ if test -z "$PATH_ORIG" ; then \
PATH_ORIG="$PATH"; export PATH_ORIG; \ PATH_ORIG="$PATH"; export PATH_ORIG; \
fi; \ fi; \

2
macros.mingw64
View File

@ -50,7 +50,7 @@
%mingw64_windmc %{mingw64_target}-windmc %mingw64_windmc %{mingw64_target}-windmc
%mingw64_windres %{mingw64_target}-windres %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 \ if test -z "$PATH_ORIG" ; then \
PATH_ORIG="$PATH"; export PATH_ORIG; \ PATH_ORIG="$PATH"; export PATH_ORIG; \
fi; \ fi; \

2
macros.ucrt64
View File

@ -49,7 +49,7 @@
%ucrt64_windmc %{ucrt64_target}-windmc %ucrt64_windmc %{ucrt64_target}-windmc
%ucrt64_windres %{ucrt64_target}-windres %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 \ if test -z "$PATH_ORIG" ; then \
PATH_ORIG="$PATH"; export PATH_ORIG; \ PATH_ORIG="$PATH"; export PATH_ORIG; \
fi; \ fi; \

7
mingw-filesystem.spec
View File

@ -7,7 +7,7 @@
Name: mingw-filesystem Name: mingw-filesystem
Version: 141 Version: 141
Release: 1%{?dist} Release: 2%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
License: GPLv2+ License: GPLv2+
@ -245,7 +245,7 @@ cat %{SOURCE101} | grep -v "^#" | grep -v "^$" | while read loc ; do
fi fi
# If the locale is not official and not special, skip it # If the locale is not official and not special, skip it
if [ -z "$special" ]; then 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 fi
echo "%lang(${locale}) %{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw32 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 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 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
%changelog %changelog
* Tue Sep 27 2022 Sandro Mani <manisandro@gmail.com> - 141-2
- Replace egrep with grep -E
* Sat Jul 30 2022 Sandro Mani <manisandro@gmail.com> - 141-1 * Sat Jul 30 2022 Sandro Mani <manisandro@gmail.com> - 141-1
- Revert unsetting _PREFIX - Revert unsetting _PREFIX

2
mingw-find-debuginfo.sh
View File

@ -12,7 +12,7 @@ shift
for f in `find $RPM_BUILD_ROOT -type f -name "*.exe" -or -name "*.dll" -or -name "*.pyd"` for f in `find $RPM_BUILD_ROOT -type f -name "*.exe" -or -name "*.dll" -or -name "*.pyd"`
do 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 ;; *debuglink*) continue ;;
*debug*) ;; *debug*) ;;
*gnu.version*) *gnu.version*)