- PLD merge... hope nothing will got broken

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

diff --git a/adapter.sh b/adapter.sh
index 44a4ee28f296a0d8370e89fb25bfe37bcf273ba4..d5c786648e0409c1f00b8ccb0b6528d1efc28ea2 100755 (executable)
--- a/adapter.sh
+++ b/adapter.sh
@@ -12,17 +12,16 @@
 #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-RCSID='$Id$'
-REVISION=${RCSID#* * } REVISION=${REVISION%% *}
+REVISION=1.50
 VERSION="v0.35/$REVISION"
 VERSIONSTRING="\
 Adapter adapts .spec files for PLD Linux.
-$VERSION (C) 1999-2010 Free Penguins".
+$VERSION (C) 1999-2013 Free Penguins".
 
 PROGRAM=${0##*/}
 dir=$(d=$0; [ -L "$d" ] && d=$(readlink -f "$d"); dirname "$d")
 adapter=$dir/adapter.awk
-usage="Usage: $PROGRAM [FLAGS] SPECFILE
+usage="Usage: $PROGRAM [FLAGS] SPECFILEs
 
 -s|--no-sort|--skip-sort
        skip BuildRequires, Requires sorting
@@ -61,7 +60,7 @@ fi
 t=$(getopt -o hsomdaV --long help,version,sort,sort-br,no-macros,skip-macros,skip-desc,skip-defattr -n "$PROGRAM" -- "$@") || exit $?
 eval set -- "$t"
 
-while true; do
+while :; do
        case "$1" in
        -h|--help)
                echo 2>&1 "$usage"
@@ -215,11 +214,16 @@ import_rpm_macros() {
        py3_ver
 
        ruby_archdir
-       ruby_ridir
-       ruby_rubylibdir
+       ruby_libdir 
+       ruby_sitedir  
        ruby_sitearchdir
        ruby_sitelibdir
+       ruby_vendordir 
+       ruby_vendorarchdir
+       ruby_vendorlibdir
+       ruby_rubylibdir
        ruby_rdocdir
+       ruby_ridir
 
        php_pear_dir
        php_data_dir
@@ -247,6 +251,9 @@ import_rpm_macros() {
 }
 
 adapterize() {
+       local SPECFILE="$1"
+       [ -f "$SPECFILE" ] || SPECFILE="$(basename $SPECFILE .spec).spec"
+
        local workdir
        workdir=$(mktemp -d ${TMPDIR:-/tmp}/adapter-XXXXXX) || exit $?
        awk=gawk
@@ -300,20 +307,19 @@ adapterize() {
                                cat $tmp.diff
                fi
        else
-               echo "The SPEC is perfect ;)"
+               echo "The spec $SPECFILE is perfect ;)"
        fi
 
        rm -rf $workdir
 }
 
-SPECFILE="$1"
-[ -f "$SPECFILE" ] || SPECFILE="$(basename $SPECFILE .spec).spec"
-
-if [ $# -ne 1 -o ! -f "$SPECFILE" ]; then
+if [ $# -eq 0 ]; then
        echo "$usage"
        exit 1
 fi
 
-adapterize
+for SPECFILE in "$@"; do
+       adapterize $SPECFILE
+done
 
 # vim: ts=4:sw=4