packages: adapter, adapter.awk - fix rpm.groups handling

[glen]

Author: glen                         Date: Wed Apr 29 08:34:32 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix rpm.groups handling

---- Files affected:
packages:
   adapter (1.37 -> 1.38) , adapter.awk (1.418 -> 1.419) 

---- Diffs:

================================================================
Index: packages/adapter
diff -u packages/adapter:1.37 packages/adapter:1.38
--- packages/adapter:1.37	Tue Apr 28 23:11:52 2009
+++ packages/adapter	Wed Apr 29 10:34:27 2009
@@ -148,7 +148,7 @@
 # you should update the list also in adapter.awk when making changes here
 import_rpm_macros() {
 	macros="
-	_sourcedir
+	_topdir
 	_prefix
 	_bindir
 	_sbindir

================================================================
Index: packages/adapter.awk
diff -u packages/adapter.awk:1.418 packages/adapter.awk:1.419
--- packages/adapter.awk:1.418	Sat Apr 18 14:25:13 2009
+++ packages/adapter.awk	Wed Apr 29 10:34:27 2009
@@ -56,9 +56,10 @@
 
 	import_rpm_macros()
 
-	groups_file = sourcedir "/rpm.groups"
+	packages_dir = topdir "/packages"
+	groups_file = packages_dir "/rpm.groups"
 
-	system("cd `rpm --eval %_sourcedir`; [ -f rpm.groups ] || cvs up rpm.groups >/dev/null")
+	system("cd "packages_dir"; [ -f rpm.groups ] || cvs up rpm.groups > /dev/null")
 	system("[ -d ../PLD-doc ] && cd ../PLD-doc && ([ -f BuildRequires.txt ] || cvs up BuildRequires.txt >/dev/null)");
 
 	# Temporary file for changelog section
@@ -1753,9 +1754,9 @@
 # you should update the list also in adapter when making changes here
 function import_rpm_macros() {
 	# File with rpm groups
-	sourcedir = ENVIRON["_sourcedir"]
+	topdir = ENVIRON["_topdir"]
 
-	if (!sourcedir) {
+	if (!topdir) {
 		print "adapter.awk should not not be invoked directly, but via adapter script" > "/dev/stderr"
 		do_not_touch_anything = 1
 		exit(1);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter.awk?r1=1.418&r2=1.419&f=u