packages: adapter, adapter.awk - export pkgconfigdir - versionize awk and s...

[glen]

Author: glen                         Date: Mon Feb 22 08:23:31 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- export pkgconfigdir
- versionize awk and shell script dependency
- allow adapter.awk to return non-ok exit code
- update copyright year

---- Files affected:
packages:
   adapter (1.43 -> 1.44) , adapter.awk (1.438 -> 1.439) 

---- Diffs:

================================================================
Index: packages/adapter
diff -u packages/adapter:1.43 packages/adapter:1.44
--- packages/adapter:1.43	Thu Dec 10 04:15:07 2009
+++ packages/adapter	Mon Feb 22 09:23:26 2010
@@ -13,12 +13,11 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
 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")
@@ -194,6 +193,7 @@
 	_desktopdir
 	_pixmapsdir
 	_javadir
+	_pkgconfigdir
 
 	perl_sitearch
 	perl_archlib
@@ -231,19 +231,21 @@
 	export _cvsmailfeedback='%{?_cvsmailfeedback}%{!?_cvsmailfeedback:PLD Team <feedback at 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

================================================================
Index: packages/adapter.awk
diff -u packages/adapter.awk:1.438 packages/adapter.awk:1.439
--- packages/adapter.awk:1.438	Mon Feb 15 19:23:25 2010
+++ packages/adapter.awk	Mon Feb 22 09:23:26 2010
@@ -2,7 +2,7 @@
 #
 # Adapter adapts .spec files for PLD Linux.
 #
-# Copyright (C) 1999-2008 PLD-Team <feedback at pld-linux.org>
+# Copyright (C) 1999-2010 PLD-Team <feedback at pld-linux.org>
 # Authors:
 # 	Michał Kuratczyk <kura at pld.org.pl>
 # 	Sebastian Zagrodzki <s.zagrodzki at mimuw.edu.pl>
@@ -137,7 +137,7 @@
 		while (getline)		# print the rest of spec as it is
 			print
 		do_not_touch_anything = 1 # do not touch anything in END()
-		exit 0
+		exit(rc = 0)
 	}
 
 	# Generally, comments are printed without touching
@@ -975,8 +975,9 @@
 
 
 END {
-	if (do_not_touch_anything)
-		exit 0
+	if (do_not_touch_anything) {
+		exit(rc)
+	}
 
 	# TODO: need to output these in proper place
 	if (BR_count > 0) {
@@ -1092,6 +1093,9 @@
 	gsub("%{_datadir}/pixmaps", "%{_pixmapsdir}")
 	gsub("%{_datadir}/java", "%{_javadir}")
 
+	gsub("%{_libdir}/pkgconfig", "%{_pkgconfigdir}")
+	gsub(pkgconfigdir, "%{_pkgconfigdir}")
+
 	gsub(libdir, "%{_libdir}")
 	gsub(javadir, "%{_javadir}")
 
@@ -1724,7 +1728,13 @@
 	if (!topdir) {
 		print "adapter.awk should not not be invoked directly, but via adapter script" > "/dev/stderr"
 		do_not_touch_anything = 1
-		exit(1);
+		exit(rc = 1);
+	}
+
+	if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < 1.44) {
+		print "adapter shell script is outdated, please cvs up it" > "/dev/stderr"
+		do_not_touch_anything = 1
+		exit(rc = 1);
 	}
 
 	# get cvsaddress for changelog section
@@ -1748,6 +1758,7 @@
 	desktopdir = ENVIRON["_desktopdir"]
 	pixmapsdir = ENVIRON["_pixmapsdir"]
 	javadir = ENVIRON["_javadir"]
+	pkgconfigdir = ENVIRON["_pkgconfigdir"]
 
 	perl_sitearch = ENVIRON["perl_sitearch"]
 	perl_archlib = ENVIRON["perl_archlib"]
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter?r1=1.43&r2=1.44&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter.awk?r1=1.438&r2=1.439&f=u