RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ configure.ac macros.in rpm/rpmio/ rpmmacro.h

From: Anders F. Björklund <afb@rpm5.org>
Date: Thu 06 Dec 2007 - 21:45:34 CET
Message-Id: <20071206204534.86A77348477@rpm5.org>
  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:   06-Dec-2007 21:45:34
  Branch: HEAD                             Handle: 2007120620453400

  Modified files:
    rpm                     configure.ac macros.in
    rpm/rpmio               rpmmacro.h

  Log:
    don't use old lzmash tool anymore

  Summary:
    Revision    Changes     Path
    2.263       +0  -1      rpm/configure.ac
    1.206       +1  -2      rpm/macros.in
    2.43        +1  -1      rpm/rpmio/rpmmacro.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.262 -r2.263 configure.ac
  --- rpm/configure.ac	6 Dec 2007 18:49:20 -0000	2.262
  +++ rpm/configure.ac	6 Dec 2007 20:45:34 -0000	2.263
  @@ -447,7 +447,6 @@
   AC_PATH_PROG(__LDCONFIG, ldconfig, /sbin/ldconfig, $MYPATH)
   AC_PATH_PROG(__LUA, lua, %{_bindir}/lua, $MYPATH)
   AC_PATH_PROG(__LZMA, lzma, %{_bindir}/lzma, $MYPATH)
  -AC_PATH_PROG(__LZMASH, lzmash, %{_bindir}/lzmash, $MYPATH)
   AC_PATH_PROG(__LZOP, lzop, %{_bindir}/lzop, $MYPATH)
   AC_PATH_PROG(__MAKE, make, %{_bindir}/make, $MYPATH)
   AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  ============================================================================
  $ cvs diff -u -r1.205 -r1.206 macros.in
  --- rpm/macros.in	6 Dec 2007 14:47:47 -0000	1.205
  +++ rpm/macros.in	6 Dec 2007 20:45:34 -0000	1.206
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.205 2007/12/06 14:47:47 rse Exp $
  +# $Id: macros.in,v 1.206 2007/12/06 20:45:34 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,7 +64,6 @@
   %__lua			@__LUA@
   %__ln_s			@LN_S@
   %__lzma			@__LZMA@
  -%__lzmash		@__LZMASH@
   %__lzop			@__LZOP@
   %__make			@__MAKE@
   %make			%{__make}
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmmacro.h
  ============================================================================
  $ cvs diff -u -r2.42 -r2.43 rpmmacro.h
  --- rpm/rpmio/rpmmacro.h	15 Nov 2007 14:56:21 -0000	2.42
  +++ rpm/rpmio/rpmmacro.h	6 Dec 2007 20:45:34 -0000	2.43
  @@ -190,7 +190,7 @@
       COMPRESSED_BZIP2		= 2,	/*!< bzip2 can handle */
       COMPRESSED_ZIP		= 3,	/*!< unzip can handle */
       COMPRESSED_LZOP		= 4,	/*!< lzop can handle */
  -    COMPRESSED_LZMA		= 5	/*!< lzmash can handle */
  +    COMPRESSED_LZMA		= 5	/*!< lzma can handle */
   } rpmCompressedMagic;
   
   /**
  @@ .
Received on Thu Dec 6 21:45:34 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.