Author: glen Date: Thu Feb 11 19:25:18 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- packages_dir = top dir, requires rpm build macros >= 1.534
---- Files affected:
packages:
adapter.awk (1.436 -> 1.437) , builder (1.603 -> 1.604)
---- Diffs:
================================================================
Index: packages/adapter.awk
diff -u packages/adapter.awk:1.436 packages/adapter.awk:1.437
--- packages/adapter.awk:1.436 Wed Feb 10 17:34:12 2010
+++ packages/adapter.awk Thu Feb 11 20:25:12 2010
@@ -59,7 +59,7 @@
import_rpm_macros()
- packages_dir = topdir "/packages"
+ packages_dir = topdir
groups_file = packages_dir "/rpm.groups"
system("cd "packages_dir"; [ -f rpm.groups ] || cvs up rpm.groups >
/dev/null")
================================================================
Index: packages/builder
diff -u packages/builder:1.603 packages/builder:1.604
--- packages/builder:1.603 Wed Feb 3 13:25:36 2010
+++ packages/builder Thu Feb 11 20:25:12 2010
@@ -662,8 +662,8 @@
if [ "$NOINIT" != "yes" ] ; then
TOP_DIR=$(eval $RPM $RPMOPTS --eval '%{_topdir}')
- REPO_DIR=$TOP_DIR/packages
- PACKAGE_DIR=$TOP_DIR/packages/$ASSUMED_NAME
+ REPO_DIR=$TOP_DIR
+ PACKAGE_DIR=$REPO_DIR/$ASSUMED_NAME
else
REPO_DIR="."
PACKAGE_DIR="."
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter.awk?r1=1.436&r2=1.437&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.603&r2=1.604&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
