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

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   27-Jun-2007 10:18:53
  Branch: HEAD                             Handle: 2007062709185201

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               rpmio.c

  Log:
    in rpmio for LZMA use %{__lzma} macro instead of hard-coded
    /usr/bin/lzma when possible

  Summary:
    Revision    Changes     Path
    1.1401      +1  -0      rpm/CHANGES
    1.83        +4  -1      rpm/rpmio/rpmio.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1400 -r1.1401 CHANGES
  --- rpm/CHANGES	26 Jun 2007 18:47:21 -0000	1.1400
  +++ rpm/CHANGES	27 Jun 2007 08:18:52 -0000	1.1401
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rse: in rpmio for LZMA use %{__lzma} macro instead of hard-coded /usr/bin/lzma when possible
       - rse: use explicit enable/disable of Perl and Python APIs
       - rse: cleanup elf(3) API related Autoconf glue
       - rse: use --enable-maintainer-mode to enable Automake rebuilds for maintainers only
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.c
  ============================================================================
  $ cvs diff -u -r1.82 -r1.83 rpmio.c
  --- rpm/rpmio/rpmio.c	20 Jun 2007 15:55:39 -0000	1.82
  +++ rpm/rpmio/rpmio.c	27 Jun 2007 08:18:53 -0000	1.83
  @@ -2821,6 +2821,7 @@
       int pid;
       int p[2];
       int xx;
  +    const char *lzma;
   
       if (fdno < 0) return NULL;
       if (pipe(p) < 0) {
  @@ -2857,8 +2858,10 @@
           xx = dup2(fdno, 1);
           for (i = 3; i < 1024; i++)
   	    xx = close(i);
  -        if (execl("/usr/bin/lzma", "lzma", "e", "-si", "-so", NULL))
  +        lzma = rpmGetPath("%{?__lzma}%{!?__lzma:/usr/bin/lzma}", NULL);
  +        if (execl(lzma, "lzma", "e", "-si", "-so", NULL))
               _exit(1);
  +        lzma = _free(lzma);
       }
       return NULL; /* warning */
   }
  @@ .