- packages_dir = top dir, requires rpm build macros >= 1.534

Changed files:
    adapter.awk -> 1.437
    builder.sh -> 1.604

diff --git a/adapter.awk b/adapter.awk
index 07ad941a024f007a4ba64b231865f2211dbe29d9..ac66768d40c58e26c207c544028e5845bc89ed97 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -59,7 +59,7 @@ BEGIN {
 
        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")

diff --git a/builder.sh b/builder.sh
index d5d6c83ff695371737991f4bb842b67377943da4..549126b1ea716088a75a4ba88fc26802bccc9baa 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -662,8 +662,8 @@ init_builder() {
 
        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="."