aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2022-09-03 21:26:29 +0300
committerJani Välimaa <wally@mageia.org>2022-09-03 21:26:29 +0300
commit76c1a8834a4425e6cfcc477e9dd75c5b1e5129b6 (patch)
tree6361b3b633b3cbbbb2c80eab9fa6f6f188366b0f
parent689b85e0b601ca89ab62e87013b901489745df46 (diff)
downloadrpm-setup-76c1a8834a4425e6cfcc477e9dd75c5b1e5129b6.tar
rpm-setup-76c1a8834a4425e6cfcc477e9dd75c5b1e5129b6.tar.gz
rpm-setup-76c1a8834a4425e6cfcc477e9dd75c5b1e5129b6.tar.bz2
rpm-setup-76c1a8834a4425e6cfcc477e9dd75c5b1e5129b6.tar.xz
rpm-setup-76c1a8834a4425e6cfcc477e9dd75c5b1e5129b6.zip
Replace obsolescent egrep with 'grep -E' in devel.prov and devel.req
-rw-r--r--NEWS2
-rw-r--r--devel.prov2
-rw-r--r--devel.req4
3 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 82ad410..ec168a0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- replace obsolescent egrep with 'grep -E' in devel.prov and devel.req
+
Version 2.66 - 19 June 2022, by Jani Välimaa
- build.macros: use -Wl,--build-id=sha1 with %build_ldflags
diff --git a/devel.prov b/devel.prov
index 5e5e58e..bbe5530 100644
--- a/devel.prov
+++ b/devel.prov
@@ -6,7 +6,7 @@ while read instfile ; do
filelist="$filelist $instfile"
done
-for i in `echo $filelist | tr '[:blank:]' "\n" | egrep '(/usr)?/lib(|64)(/gcc(-lib)?/.+)?/[^/]+\.so$'`; do
+for i in `echo $filelist | tr '[:blank:]' "\n" | grep -E '(/usr)?/lib(|64)(/gcc(-lib)?/.+)?/[^/]+\.so$'`; do
objd=`objdump -p ${i} | grep SONAME`
[ -h ${i} -a -n "${objd}" ] && \
lib64=`if file -L $i 2>/dev/null | grep "ELF 64-bit" >/dev/null; then echo "(64bit)"; fi` && \
diff --git a/devel.req b/devel.req
index b4982f0..ad73240 100644
--- a/devel.req
+++ b/devel.req
@@ -9,7 +9,7 @@ done
# for objdump:
export LC_ALL=C
-for i in `echo $filelist | tr '[:blank:]' "\n" | egrep "(/usr)?/lib(|64)/[^/]+\.so$"`; do
+for i in `echo $filelist | tr '[:blank:]' "\n" | grep -E "(/usr)?/lib(|64)/[^/]+\.so$"`; do
objd=`objdump -p ${i} | grep SONAME`
lib64=`if file -L $i 2>/dev/null | grep "ELF 64-bit" >/dev/null; then echo "(64bit)"; fi` && \
if [ -h ${i} -a -n "${objd}" ]; then
@@ -24,6 +24,6 @@ for i in `echo $filelist | tr '[:blank:]' "\n" | egrep "(/usr)?/lib(|64)/[^/]+\.
}
'
fi
-done | egrep -v 'devel\(linux-gate|linux-vdso32|linux-vdso64|lib(c|pthread|rt)(\(64bit\))?\)' | sort -u
+done | grep -E -v 'devel\(linux-gate|linux-vdso32|linux-vdso64|lib(c|pthread|rt)(\(64bit\))?\)' | sort -u