- remove trailing whitespace before trying to split %configure options

[packages/rpm-build-tools.git] / adapter.sh

diff --git a/adapter.sh b/adapter.sh
index f3b25054ec57fe2ff1d746fb355c3415d8cefae6..ecf0f77dc4e3fac8be7d22cea60394ea1a87a398 100644 (file)
--- a/adapter.sh
+++ b/adapter.sh
@@ -13,15 +13,14 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
 RCSID='$Id$'
-r=${RCSID#* * }
-rev=${r%% *}
-VERSION="v0.35/$rev"
+REVISION=${RCSID#* * } REVISION=${REVISION%% *}
+VERSION="v0.35/$REVISION"
 VERSIONSTRING="\
 Adapter adapts .spec files for PLD Linux.
-$VERSION (C) 1999-2009 Free Penguins".
+$VERSION (C) 1999-2010 Free Penguins".
 
 PROGRAM=${0##*/}
-dir=$(d=$0; [ -L "$d" ] && d=$(readlink "$d"); dirname "$d")
+dir=$(d=$0; [ -L "$d" ] && d=$(readlink -f "$d"); dirname "$d")
 adapter=$dir/adapter.awk
 usage="Usage: $PROGRAM [FLAGS] SPECFILE
 
@@ -194,6 +193,8 @@ import_rpm_macros() {
        _desktopdir
        _pixmapsdir
        _javadir
+       _pkgconfigdir
+       _npkgconfigdir
 
        perl_sitearch
        perl_archlib
@@ -207,6 +208,11 @@ import_rpm_macros() {
        py_scriptdir
        py_ver
 
+       py3_sitescriptdir
+       py3_sitedir
+       py3_scriptdir
+       py3_ver
+
        ruby_archdir
        ruby_ridir
        ruby_rubylibdir
@@ -231,19 +237,21 @@ import_rpm_macros() {
        export _cvsmailfeedback='%{?_cvsmailfeedback}%{!?_cvsmailfeedback:PLD Team <feedback@pld-linux.org>}'
        "
 
+       export ADAPTER_REVISION=$REVISION
+
        eval $(rpm --eval "$(echo -e $eval_expr)")
 }
 
 adapterize() {
        local workdir
-       workdir=$(mktemp -d ${TMPDIR:-/tmp}/adapter-XXXXXX) || exit
+       workdir=$(mktemp -d ${TMPDIR:-/tmp}/adapter-XXXXXX) || exit $?
        awk=gawk
 
-       local tmp=$workdir/$(basename $SPECFILE) || exit
+       local tmp=$workdir/$(basename $SPECFILE) || exit $?
 
        import_rpm_macros
 
-       LC_ALL=en_US.UTF-8 $awk -f $adapter $SPECFILE > $tmp || exit
+       LC_ALL=en_US.UTF-8 $awk -f $adapter $SPECFILE > $tmp || exit $?
 
        if [ "$outputonly" = 1 ]; then
                cat $tmp