SPECS: builder - assume SPECNAME == PACKAGE_NAME for _{spec, source...

[baggins]

Author: baggins                      Date: Sun May 13 14:57:50 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- assume SPECNAME == PACKAGE_NAME for _{spec,source}dir definition,
  that't preliminary change if we switch repo to directory per package format

---- Files affected:
SPECS:
   builder (1.502 -> 1.503) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.502 SPECS/builder:1.503
--- SPECS/builder:1.502	Fri May 11 14:02:08 2007
+++ SPECS/builder	Sun May 13 16:57:45 2007
@@ -79,6 +79,7 @@
 PACKAGE_RELEASE=""
 PACKAGE_VERSION=""
 PACKAGE_NAME=""
+ASSUMED_NAME=""
 PROTOCOL="ftp"
 WGET_RETRIES=${MAX_WGET_RETRIES:-0}
 CVS_RETRIES=${MAX_CVS_RETRIES:-1000}
@@ -597,8 +598,8 @@
 	fi
 
 	if [ "$NOINIT" != "yes" ] ; then
-		SOURCE_DIR="`eval $RPM $RPMOPTS --eval '%{_sourcedir}'`"
-		SPECS_DIR="`eval $RPM $RPMOPTS --eval '%{_specdir}'`"
+		SOURCE_DIR="`eval $RPM $RPMOPTS --define "name $ASSUMED_NAME" --eval '%{_sourcedir}'`"
+		SPECS_DIR="`eval $RPM $RPMOPTS --define "name $ASSUMED_NAME" --eval '%{_specdir}'`"
 	else
 		SOURCE_DIR="."
 		SPECS_DIR="."
@@ -2068,6 +2069,7 @@
 				CVSTAG="${SPECFILE##*:}"
 				SPECFILE="${SPECFILE%%:*}"
 			fi
+			ASSUMED_NAME="${SPECFILE%%:.spec}"
 			shift
 	esac
 done
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/builder?r1=1.502&r2=1.503&f=u