Commit c3df2fbf authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmreqs: fix symbol version stripping to preserve () for apt

parent 7e547ae4
...@@ -19,7 +19,7 @@ fi ...@@ -19,7 +19,7 @@ fi
# moved from aptU # moved from aptU
get_rpm_package_requires() get_rpm_package_requires()
{ {
(rpmquery --requires "$@" || return ) | cut -f1 -d" " | sed -e "s|\(^lib.*\)(.*[0-9])|\1|g" | grep -v "^rpmlib" | sort -u (rpmquery --requires "$@" || return ) | cut -f1 -d" " | sed -e 's|\(^lib.*\)(.*[0-9])|\1()|g' | grep -v "^rpmlib" | sort -u
} }
filter_pkgname() filter_pkgname()
...@@ -143,7 +143,7 @@ trans_rpmdeps_to_pkgname_lav() ...@@ -143,7 +143,7 @@ trans_rpmdeps_to_pkgname_lav()
# FIXME: strange regexp for drop libNAME.so.NUM and perl(Package) and /bin/sh # FIXME: strange regexp for drop libNAME.so.NUM and perl(Package) and /bin/sh
REALPKGNAMELIST=$(estrlist reg_exclude ".*\.so\..* .*/.* .*(.*" "$REQLIST") REALPKGNAMELIST=$(estrlist reg_exclude ".*\.so\..* .*/.* .*(.*" "$REQLIST")
# FIXME: external list? Set priorities/ # FIXME: external list? Set priorities/
REQCONVLIST="$(estrlist exclude "$REALPKGNAMELIST" "$REQLIST" | filter_multiple_provides | sed -e "s|\([^)]\)(64bit)|\1.*(64bit)|g")" REQCONVLIST="$(estrlist exclude "$REALPKGNAMELIST" "$REQLIST" | filter_multiple_provides)"
# partially copied from aptU # partially copied from aptU
#VIRTREQ=$(LANG=C apt-get install --print-uris $REQLIST 2>&1 | grep "is a virtual package provided by" | cut -f2 -d" " | sort -u) #VIRTREQ=$(LANG=C apt-get install --print-uris $REQLIST 2>&1 | grep "is a virtual package provided by" | cut -f2 -d" " | sort -u)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment