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:15:03
  Branch: HEAD                             Handle: 2007072202150300

  Modified files:
    rpm/lib                 psm.c

  Log:
    revert 2.210.

  Summary:
    Revision    Changes     Path
    2.212       +4  -4      rpm/lib/psm.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/psm.c
  ============================================================================
  $ cvs diff -u -r2.211 -r2.212 psm.c
  --- rpm/lib/psm.c	20 Jul 2007 16:23:36 -0000	2.211
  +++ rpm/lib/psm.c	22 Jul 2007 01:15:03 -0000	2.212
  @@ -275,7 +275,7 @@
   	}
       }
   
  -    _sourcedir = rpmGenPath(rpmtsRootDir(ts), "%{?_sourcedir/}", "");
  +    _sourcedir = rpmGenPath(rpmtsRootDir(ts), "%{_sourcedir}", "");
       rpmrc = rpmMkdirPath(_sourcedir, "sourcedir");
       if (rpmrc) {
   	rpmrc = RPMRC_FAIL;
  @@ -288,7 +288,7 @@
   	goto exit;
       }
   
  -    _specdir = rpmGenPath(rpmtsRootDir(ts), "%{?_specdir/}", "");
  +    _specdir = rpmGenPath(rpmtsRootDir(ts), "%{_specdir}", "");
       rpmrc = rpmMkdirPath(_specdir, "specdir");
       if (rpmrc) {
   	rpmrc = RPMRC_FAIL;
  @@ -1691,8 +1691,8 @@
   		pkgbn = headerSprintf(fi->h, bfmt,
   					rpmTagTable, rpmHeaderFormats, NULL);
   		bfmt = _free(bfmt);
  -		psm->pkgURL = rpmGenPath("%{?_repackage_root/}",
  -					 "%{?_repackage_dir/}",
  +		psm->pkgURL = rpmGenPath("%{?_repackage_root}",
  +					 "%{?_repackage_dir}",
   					pkgbn);
   		pkgbn = _free(pkgbn);
   		(void) urlPath(psm->pkgURL, &psm->pkgfn);
  @@ .