- rpmdeps always calls .prov and .req helpers, so both defines must be passed

  in both wrappers...

Changed files:
    rpm-find-provides-wrapper -> 1.4
    rpm-find-requires-wrapper -> 1.4

diff --git a/rpm-find-provides-wrapper b/rpm-find-provides-wrapper
index dd459c0276045266cd910eb06c9f0548d0508007..f1137b9cac71fe0b297328c4af740c55f80c544b 100644 (file)
--- a/rpm-find-provides-wrapper
+++ b/rpm-find-provides-wrapper
@@ -10,7 +10,9 @@
 ulimit -c 0
 
 PERLOPT="--define=__perl_provides /bin/sh -c 'cat >/dev/null'"
+PERLOPT2="--define=__perl_requires /bin/sh -c 'cat >/dev/null'"
 PHPOPT="--define=__php_provides /bin/sh -c 'cat >/dev/null'"
+PHPOPT2="--define=__php_requires /bin/sh -c 'cat >/dev/null'"
 noprovfiles=''
 noprov=''
 buildroot=''
@@ -18,9 +20,11 @@ while [ $# -gt 0 ]; do
        case "$1" in
          --with-perl)
                PERLOPT=""
+               PERLOPT2=""
                ;;
          --with-php)
                PHPOPT=""
+               PHPOPT2=""
                ;;
          --buildroot=*)
                buildroot="${1#--buildroot=}"
@@ -52,7 +56,8 @@ fi
 
 # rpmdeps output seems sorted, but resort it in case of long list split
 grep -v -e "^\(${noprovfiles}\)\$" | tr '\n' '\0' | \
-       xargs -r -0 /usr/bin/rpmdeps "${PERLOPT}" "${PHPOPT}" --provides | \
+       xargs -r -0 /usr/bin/rpmdeps "${PERLOPT}" "${PERLOPT2}" \
+               "${PHPOPT}" "${PHPOPT2}" --provides | \
        LC_ALL=C sort -u | grep -v -e "^\(${noprov}\)\$"
 
 exit 0

diff --git a/rpm-find-requires-wrapper b/rpm-find-requires-wrapper
index 4ae70c9235bf4511f81cc835226bb4698c9f0916..9bea80602bcfc1b88c8b5ec3e0657076584823ab 100644 (file)
--- a/rpm-find-requires-wrapper
+++ b/rpm-find-requires-wrapper
@@ -10,7 +10,9 @@
 ulimit -c 0
 
 PERLOPT="--define=__perl_requires /bin/sh -c 'cat >/dev/null'"
+PERLOPT2="--define=__perl_provides /bin/sh -c 'cat >/dev/null'"
 PHPOPT="--define=__php_requires /bin/sh -c 'cat >/dev/null'"
+PHPOPT2="--define=__php_provides /bin/sh -c 'cat >/dev/null'"
 PROVARG=""
 NOPROVFILES=""
 NOPROV=""
@@ -21,10 +23,12 @@ while [ $# -gt 0 ]; do
        case "$1" in
          --with-perl)
                PERLOPT=""
+               PERLOPT2=""
                PROVARG="$PROVARG --with-perl"
                ;;
          --with-php)
                PHPOPT=""
+               PHPOPT2=""
                PROVARG="$PROVARG --with-php"
                ;;
          --buildroot=*)
@@ -84,7 +88,8 @@ tee ${FILES} | \
 
 # rpmdeps output seems sorted, but resort it in case of long list split
 grep -v -e "^\(${noreqfiles}\)\$" ${FILES} | tr '\n' '\0' | \
-       xargs -r -0 /usr/bin/rpmdeps "${PERLOPT}" "${PHPOPT}" --requires | \
+       xargs -r -0 /usr/bin/rpmdeps "${PERLOPT}" "${PERLOPT2}" \
+               "${PHPOPT}" "${PHPOPT2}" --requires | \
        LC_ALL=C sort -u | grep -v -e "^\(${noreq}\)\$" | \
        LC_ALL=C comm -2 -3 - ${PROVS} | tee ${REQS}