RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   22-Jul-2007 03:20:04
  Branch: HEAD                             Handle: 2007072202200400

  Modified files:
    rpm/build               parsePrep.c

  Log:
    revert 2.84.

  Summary:
    Revision    Changes     Path
    2.85        +12 -12     rpm/build/parsePrep.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/build/parsePrep.c
  ============================================================================
  $ cvs diff -u -r2.84 -r2.85 parsePrep.c
  --- rpm/build/parsePrep.c	20 Jul 2007 16:23:36 -0000	2.84
  +++ rpm/build/parsePrep.c	22 Jul 2007 01:20:04 -0000	2.85
  @@ -90,7 +90,7 @@
       taropts = ((rpmIsVerbose() && !quietly) ? "-xvvf" : "-xf");
       /*@=internalglobs@*/
   
  -    Lurlfn = rpmGenPath(NULL, "%{?_sourcedir/}", sp->source);
  +    Lurlfn = rpmGenPath(NULL, "%{_sourcedir}/", sp->source);
   
       /* XXX On non-build parse's, file cannot be stat'd or read */
       if (!spec->force && (isCompressed(Lurlfn, &compressed) || checkOwners(Lurlfn))) {
  @@ -268,7 +268,7 @@
       argv = _free(argv);
   
       /* cd to the build dir */
  -    {	const char * buildDirURL = rpmGenPath(spec->rootURL, "%{?_builddir/}", "");
  +    {	const char * buildDirURL = rpmGenPath(spec->rootURL, "%{_builddir}", "");
   	const char *buildDir;
   
   	(void) urlPath(buildDirURL, &buildDir);
  @@ -357,7 +357,7 @@
   
       /* XXX insure that %{_sourcedir} exists */
       rpmrc = RPMRC_OK;
  -    Lurlfn = rpmGenPath(NULL, "%{?_sourcedir/}", NULL);
  +    Lurlfn = rpmGenPath(NULL, "%{?_sourcedir}", NULL);
       if (Lurlfn != NULL && *Lurlfn != '\0')
   	rpmrc = rpmMkdirPath(Lurlfn, "_sourcedir");
       Lurlfn = _free(Lurlfn);
  @@ -366,7 +366,7 @@
   
       /* XXX insure that %{_patchdir} exists */
       rpmrc = RPMRC_OK;
  -    Lurlfn = rpmGenPath(NULL, "%{?_patchdir/}", NULL);
  +    Lurlfn = rpmGenPath(NULL, "%{?_patchdir}", NULL);
       if (Lurlfn != NULL && *Lurlfn != '\0')
   	rpmrc = rpmMkdirPath(Lurlfn, "_patchdir");
       Lurlfn = _free(Lurlfn);
  @@ -375,7 +375,7 @@
   
       /* XXX insure that %{_icondir} exists */
       rpmrc = RPMRC_OK;
  -    Lurlfn = rpmGenPath(NULL, "%{?_icondir/}", NULL);
  +    Lurlfn = rpmGenPath(NULL, "%{?_icondir}", NULL);
       if (Lurlfn != NULL && *Lurlfn != '\0')
   	rpmrc = rpmMkdirPath(Lurlfn, "_icondir");
       Lurlfn = _free(Lurlfn);
  @@ -387,16 +387,16 @@
       for (sp = spec->sources; sp != NULL; sp = sp->next) {
   
   	if (sp->flags & RPMFILE_SOURCE) {
  -	    Rmacro = "%{?_Rsourcedir/}";
  -	    Lmacro = "%{?_sourcedir/}";
  +	    Rmacro = "%{?_Rsourcedir}/";
  +	    Lmacro = "%{?_sourcedir}/";
   	} else
   	if (sp->flags & RPMFILE_PATCH) {
  -	    Rmacro = "%{?_Rpatchdir/}";
  -	    Lmacro = "%{?_patchdir/}";
  +	    Rmacro = "%{?_Rpatchdir}/";
  +	    Lmacro = "%{?_patchdir}/";
   	} else
   	if (sp->flags & RPMFILE_ICON) {
  -	    Rmacro = "%{?_Ricondir/}";
  -	    Lmacro = "%{?_icondir/}";
  +	    Rmacro = "%{?_Ricondir}/";
  +	    Lmacro = "%{?_icondir}/";
   	} else
   	    continue;
   
  @@ -413,7 +413,7 @@
   	}
   
   	Rurlfn = rpmGenPath(NULL, Rmacro, sp->source);
  -	if (Rurlfn == NULL || Rurlfn[0] == '\0' || !strcmp(Lurlfn, Rurlfn)) {
  +	if (Rurlfn == NULL || Rurlfn[0] == '\0' || !strcmp(Rurlfn, "/") || !strcmp(Lurlfn, Rurlfn)) {
   	    rpmError(RPMERR_BADFILENAME, _("file %s missing: %s\n"),
   		Lurlfn, strerror(errno));
   	    ec++;
  @@ .