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

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: rpm                              Date:   01-Dec-2007 10:36:36
  Branch: HEAD                             Handle: 2007120109363501

  Modified files:
    rpm                     CHANGES configure.ac macros.in
    rpm/build               parsePrep.c
    rpm/rpmio               rpmio.c

  Log:
    remove macros and complexity, keep it simple with LZMA Utils

  Summary:
    Revision    Changes     Path
    1.1901      +0  -1      rpm/CHANGES
    2.97        +1  -1      rpm/build/parsePrep.c
    2.255       +0  -18     rpm/configure.ac
    1.203       +1  -3      rpm/macros.in
    1.111       +1  -12     rpm/rpmio/rpmio.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1900 -r1.1901 CHANGES
  --- rpm/CHANGES	30 Nov 2007 15:22:37 -0000	1.1900
  +++ rpm/CHANGES	1 Dec 2007 09:36:35 -0000	1.1901
  @@ -1,5 +1,4 @@
   5.0a2 -> 5.0a3:
  -    - afb: use %{?__lzma_encode_args} and %{?__lzma_decode_args} macros.
       - jbj: parse arbitrary tags permitted by _arbitrary_tags white list.
       - jbj: fix: renumber rpmParseState_e to avoid rpmRC error returns.
       - rpm.org: remove unnecessary includes.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/build/parsePrep.c
  ============================================================================
  $ cvs diff -u -r2.96 -r2.97 parsePrep.c
  --- rpm/build/parsePrep.c	30 Nov 2007 15:22:38 -0000	2.96
  +++ rpm/build/parsePrep.c	1 Dec 2007 09:36:35 -0000	2.97
  @@ -260,7 +260,7 @@
   	    t = "%{__lzop} -dc";
   	    break;
   	case COMPRESSED_LZMA:
  -	    t = "%{__lzma} %{?__lzma_decode_args}%{!?__lzma_decode_args:-dc}";
  +	    t = "%{__lzma} -dc";
   	    break;
   	case COMPRESSED_ZIP:
   	    if (rpmIsVerbose() && !quietly)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.254 -r2.255 configure.ac
  --- rpm/configure.ac	30 Nov 2007 18:03:04 -0000	2.254
  +++ rpm/configure.ac	1 Dec 2007 09:36:35 -0000	2.255
  @@ -428,24 +428,6 @@
   fi
   AC_SUBST(__ID_U)
   
  -dnl # check whether we are using LZMA SDK or LZMA Utils variant of lzma(1).
  -AC_MSG_CHECKING(for lzma(1) variant)
  -if (${__LZMA} -V 2>&1 | grep "LZMA Utils") >/dev/null 2>&1; then
  -    AC_MSG_RESULT([LZMA Utils])
  -    __LZMA_ENCODE_ARGS="%{nil}"
  -    __LZMA_DECODE_ARGS="-dc"
  -elif (${__LZMA} -V 2>&1 | grep "^LZMA") >/dev/null 2>&1; then
  -    AC_MSG_RESULT([LZMA SDK])
  -    __LZMA_ENCODE_ARGS="e -si -so"
  -    __LZMA_DECODE_ARGS="d -si -so"
  -else
  -    AC_MSG_RESULT(none)
  -    __LZMA_ENCODE_ARGS="%{nil}"
  -    __LZMA_DECODE_ARGS="%{nil}"
  -fi
  -AC_SUBST(__LZMA_ENCODE_ARGS)
  -AC_SUBST(__LZMA_DECODE_ARGS)
  -
   dnl # auto-detect whether doxygen generated API docs should be included.
   AC_PATH_PROG(__DOXYGEN, doxygen, no, $PATH)
   withval=auto
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  ============================================================================
  $ cvs diff -u -r1.202 -r1.203 macros.in
  --- rpm/macros.in	30 Nov 2007 15:23:42 -0000	1.202
  +++ rpm/macros.in	1 Dec 2007 09:36:35 -0000	1.203
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.202 2007/11/30 15:23:42 afb Exp $
  +# $Id: macros.in,v 1.203 2007/12/01 09:36:35 afb Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -64,8 +64,6 @@
   %__lua			@__LUA@
   %__ln_s			@LN_S@
   %__lzma			@__LZMA@
  -%__lzma_encode_args	@__LZMA_ENCODE_ARGS@
  -%__lzma_decode_args	@__LZMA_DECODE_ARGS@
   %__lzmash		@__LZMASH@
   %__lzop			@__LZOP@
   %__make			@__MAKE@
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmio.c
  ============================================================================
  $ cvs diff -u -r1.110 -r1.111 rpmio.c
  --- rpm/rpmio/rpmio.c	30 Nov 2007 15:22:38 -0000	1.110
  +++ rpm/rpmio/rpmio.c	1 Dec 2007 09:36:36 -0000	1.111
  @@ -2782,8 +2782,6 @@
       return rc;
   }
   
  -#define LZMA_ARGS_LEN	32 /* should be enough for any tweaking */
  -
   /*@-mods@*/	/* XXX hide rpmGlobalMacroContext mods for now. */
   static FD_t lzdWriteOpen(int fdno, int fopen)
   	/*@globals fileSystem, internalState @*/
  @@ -2793,9 +2791,6 @@
       int p[2];
       int xx;
       const char *lzma;
  -    char *args;
  -    char *av[LZMA_ARGS_LEN+2];
  -    char *saveptr;
   
       if (fdno < 0) return NULL;
       if (pipe(p) < 0) {
  @@ -2833,15 +2828,9 @@
           for (i = 3; i < 1024; i++)
   	    xx = close(i);
           lzma = rpmGetPath("%{?__lzma}%{!?__lzma:/usr/bin/lzma}", NULL);
  -        av[0] = (char*)lzma;
  -        args = rpmExpand("%{?__lzma_encode_args}", NULL);
  -        for (i = 1; i < sizeof(av)/sizeof(av[0])-1; i++)
  -            av[i] = strtok_r(i == 1 ? args : NULL, " ", &saveptr);
  -        av[i] = NULL;
  -        if (execv(lzma, av))
  +        if (execl(lzma, "lzma", NULL))
               _exit(1);
           lzma = _free(lzma);
  -        args = _free(args);
       }
       return NULL; /* warning */
   }
  @@ .