X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=adapter.sh;h=2b1e987107713b7bad171a25eaedd53cdbbc3e0c;hb=5eb1d24bb1e5df1ac57257bf98b688e82c0cad9e;hp=efaa60192474db89e7e620b05059198be34d623c;hpb=84f951069ad78e3e34533eaa67af5c70349bec4a;p=packages%2Frpm-build-tools.git

diff --git a/adapter.sh b/adapter.sh
old mode 100644
new mode 100755
index efaa601..2b1e987
--- a/adapter.sh
+++ b/adapter.sh
@@ -12,17 +12,16 @@
 #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-RCSID='$Id$'
-REVISION=${RCSID#* * } REVISION=${REVISION%% *}
+REVISION=1.52
 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"
@@ -194,6 +193,8 @@ import_rpm_macros() {
 	_pixmapsdir
 	_javadir
 	_pkgconfigdir
+	_npkgconfigdir
+	_localedir
 
 	perl_sitearch
 	perl_archlib
@@ -207,16 +208,31 @@ import_rpm_macros() {
 	py_scriptdir
 	py_ver
 
+	py3_sitescriptdir
+	py3_sitedir
+	py3_scriptdir
+	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
+	ruby_specdir
 
 	php_pear_dir
 	php_data_dir
 	tmpdir
+
+	systemdunitdir
+	systemduserunitdir
+	systemdtmpfilesdir
 "
 	eval_expr=""
 	for macro in $macros; do
@@ -237,6 +253,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
@@ -290,20 +309,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